diff options
author | Zack Middleton <zturtleman@gmail.com> | 2013-02-11 16:37:00 -0600 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2013-02-16 21:54:32 +0000 |
commit | 2adfeadacd6f7f045a316b09650176a4bf1dab55 (patch) | |
tree | 8d4455d7aab8a88316775574e6abd17c6c50b9d6 /src/rend2 | |
parent | caaa94752abfdf59139e301cf82d4bf31c20c6d9 (diff) |
Remove newlines from Rend2 error messages
Diffstat (limited to 'src/rend2')
-rw-r--r-- | src/rend2/tr_bsp.c | 2 | ||||
-rw-r--r-- | src/rend2/tr_glsl.c | 30 | ||||
-rw-r--r-- | src/rend2/tr_shade.c | 2 | ||||
-rw-r--r-- | src/rend2/tr_sky.c | 4 | ||||
-rw-r--r-- | src/rend2/tr_vbo.c | 16 |
5 files changed, 27 insertions, 27 deletions
diff --git a/src/rend2/tr_bsp.c b/src/rend2/tr_bsp.c index 0eb56ce4..c14245b8 100644 --- a/src/rend2/tr_bsp.c +++ b/src/rend2/tr_bsp.c @@ -3276,7 +3276,7 @@ void RE_LoadWorldMap( const char *name ) { byte *startMarker; if ( tr.worldMapLoaded ) { - ri.Error( ERR_DROP, "ERROR: attempted to redundantly load world map\n" ); + ri.Error( ERR_DROP, "ERROR: attempted to redundantly load world map" ); } // set default map light scale diff --git a/src/rend2/tr_glsl.c b/src/rend2/tr_glsl.c index 6e8d91ac..ccfea909 100644 --- a/src/rend2/tr_glsl.c +++ b/src/rend2/tr_glsl.c @@ -393,7 +393,7 @@ static int GLSL_InitGPUShader2(shaderProgram_t * program, const char *name, int if(strlen(name) >= MAX_QPATH) { - ri.Error(ERR_DROP, "GLSL_InitGPUShader2: \"%s\" is too long\n", name); + ri.Error(ERR_DROP, "GLSL_InitGPUShader2: \"%s\" is too long", name); } Q_strncpyz(program->name, name, sizeof(program->name)); @@ -867,7 +867,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.genericShader[i], "generic", attribs, qtrue, extradefines, qtrue, fallbackShader_generic_vp, fallbackShader_generic_fp, GENERIC_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load generic shader!\n"); + ri.Error(ERR_FATAL, "Could not load generic shader!"); } // There's actually no need to filter these out, since they'll @@ -941,7 +941,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.textureColorShader, "texturecolor", attribs, qtrue, NULL, qfalse, fallbackShader_texturecolor_vp, fallbackShader_texturecolor_fp, TEXTURECOLOR_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load texturecolor shader!\n"); + ri.Error(ERR_FATAL, "Could not load texturecolor shader!"); } GLSL_AddUniform(&tr.textureColorShader, TEXTURECOLOR_UNIFORM_MODELVIEWPROJECTIONMATRIX, "u_ModelViewProjectionMatrix", GLSL_MAT16); @@ -971,7 +971,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.fogShader[i], "fogpass", attribs, qtrue, extradefines, qtrue, fallbackShader_fogpass_vp, fallbackShader_fogpass_fp, FOGPASS_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load fogpass shader!\n"); + ri.Error(ERR_FATAL, "Could not load fogpass shader!"); } GLSL_AddUniform(&tr.fogShader[i], FOGPASS_UNIFORM_FOGDISTANCE, "u_FogDistance", GLSL_VEC4); @@ -1003,7 +1003,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.dlightShader[i], "dlight", attribs, qtrue, extradefines, qtrue, fallbackShader_dlight_vp, fallbackShader_dlight_fp, DLIGHT_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load dlight shader!\n"); + ri.Error(ERR_FATAL, "Could not load dlight shader!"); } GLSL_AddUniform(&tr.dlightShader[i], DLIGHT_UNIFORM_DLIGHTINFO, "u_DlightInfo", GLSL_VEC4); @@ -1166,7 +1166,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.lightallShader[i], "lightall", attribs, qtrue, extradefines, qtrue, fallbackShader_lightall_vp, fallbackShader_lightall_fp, GENERIC_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load lightall shader!\n"); + ri.Error(ERR_FATAL, "Could not load lightall shader!"); } GLSL_AddUniform(&tr.lightallShader[i], GENERIC_UNIFORM_MODELVIEWPROJECTIONMATRIX, "u_ModelViewProjectionMatrix", GLSL_MAT16); @@ -1219,7 +1219,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.shadowmapShader, "shadowfill", attribs, qtrue, extradefines, qtrue, fallbackShader_shadowfill_vp, fallbackShader_shadowfill_fp, GENERIC_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load shadowfill shader!\n"); + ri.Error(ERR_FATAL, "Could not load shadowfill shader!"); } GLSL_AddUniform(&tr.shadowmapShader, GENERIC_UNIFORM_DEFORMGEN, "u_DeformGen", GLSL_INT); @@ -1244,7 +1244,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.pshadowShader, "pshadow", attribs, qtrue, extradefines, qtrue, fallbackShader_pshadow_vp, fallbackShader_pshadow_fp, PSHADOW_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load pshadow shader!\n"); + ri.Error(ERR_FATAL, "Could not load pshadow shader!"); } GLSL_AddUniform(&tr.pshadowShader, PSHADOW_UNIFORM_MODELVIEWPROJECTIONMATRIX, "u_ModelViewProjectionMatrix", GLSL_MAT16); @@ -1270,7 +1270,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.down4xShader, "down4x", attribs, qtrue, extradefines, qtrue, fallbackShader_down4x_vp, fallbackShader_down4x_fp, TEXTURECOLOR_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load down4x shader!\n"); + ri.Error(ERR_FATAL, "Could not load down4x shader!"); } GLSL_AddUniform(&tr.down4xShader, TEXTURECOLOR_UNIFORM_MODELVIEWPROJECTIONMATRIX, "u_ModelViewProjectionMatrix", GLSL_MAT16); @@ -1294,7 +1294,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.bokehShader, "bokeh", attribs, qtrue, extradefines, qtrue, fallbackShader_bokeh_vp, fallbackShader_bokeh_fp, TEXTURECOLOR_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load bokeh shader!\n"); + ri.Error(ERR_FATAL, "Could not load bokeh shader!"); } GLSL_AddUniform(&tr.bokehShader, TEXTURECOLOR_UNIFORM_MODELVIEWPROJECTIONMATRIX, "u_ModelViewProjectionMatrix", GLSL_MAT16); @@ -1319,7 +1319,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.tonemapShader, "tonemap", attribs, qtrue, extradefines, qtrue, fallbackShader_tonemap_vp, fallbackShader_tonemap_fp, TEXTURECOLOR_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load tonemap shader!\n"); + ri.Error(ERR_FATAL, "Could not load tonemap shader!"); } GLSL_AddUniform(&tr.tonemapShader, TEXTURECOLOR_UNIFORM_MODELVIEWPROJECTIONMATRIX, "u_ModelViewProjectionMatrix", GLSL_MAT16); @@ -1352,7 +1352,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.calclevels4xShader[i], "calclevels4x", attribs, qtrue, extradefines, qtrue, fallbackShader_calclevels4x_vp, fallbackShader_calclevels4x_fp, TEXTURECOLOR_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load calclevels4x shader!\n"); + ri.Error(ERR_FATAL, "Could not load calclevels4x shader!"); } GLSL_AddUniform(&tr.calclevels4xShader[i], TEXTURECOLOR_UNIFORM_MODELVIEWPROJECTIONMATRIX, "u_ModelViewProjectionMatrix", GLSL_MAT16); @@ -1390,7 +1390,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.shadowmaskShader, "shadowmask", attribs, qtrue, extradefines, qtrue, fallbackShader_shadowmask_vp, fallbackShader_shadowmask_fp, SHADOWMASK_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load shadowmask shader!\n"); + ri.Error(ERR_FATAL, "Could not load shadowmask shader!"); } GLSL_AddUniform(&tr.shadowmaskShader, SHADOWMASK_UNIFORM_SHADOWMVP, "u_ShadowMvp", GLSL_MAT16); @@ -1426,7 +1426,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.ssaoShader, "ssao", attribs, qtrue, extradefines, qtrue, fallbackShader_ssao_vp, fallbackShader_ssao_fp, SSAO_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load ssao shader!\n"); + ri.Error(ERR_FATAL, "Could not load ssao shader!"); } GLSL_AddUniform(&tr.ssaoShader, SSAO_UNIFORM_VIEWINFO, "u_ViewInfo", GLSL_VEC4); @@ -1457,7 +1457,7 @@ void GLSL_InitGPUShaders(void) if (!GLSL_InitGPUShader(&tr.depthBlurShader[i], "depthBlur", attribs, qtrue, extradefines, qtrue, fallbackShader_depthblur_vp, fallbackShader_depthblur_fp, DEPTHBLUR_UNIFORM_COUNT)) { - ri.Error(ERR_FATAL, "Could not load depthBlur shader!\n"); + ri.Error(ERR_FATAL, "Could not load depthBlur shader!"); } GLSL_AddUniform(&tr.depthBlurShader[i], DEPTHBLUR_UNIFORM_VIEWINFO, "u_ViewInfo", GLSL_VEC4); diff --git a/src/rend2/tr_shade.c b/src/rend2/tr_shade.c index 5115398e..b4758a86 100644 --- a/src/rend2/tr_shade.c +++ b/src/rend2/tr_shade.c @@ -288,7 +288,7 @@ static void ComputeTexMatrix( shaderStage_t *pStage, int bundleNum, float *outma break; default: - ri.Error( ERR_DROP, "ERROR: unknown texmod '%d' in shader '%s'\n", bundle->texMods[tm].type, tess.shader->name ); + ri.Error( ERR_DROP, "ERROR: unknown texmod '%d' in shader '%s'", bundle->texMods[tm].type, tess.shader->name ); break; } } diff --git a/src/rend2/tr_sky.c b/src/rend2/tr_sky.c index b6efedc0..f3c24a45 100644 --- a/src/rend2/tr_sky.c +++ b/src/rend2/tr_sky.c @@ -393,7 +393,7 @@ static void DrawSkySide( struct image_s *image, const int mins[2], const int max if(tess.numVertexes >= SHADER_MAX_VERTEXES) { - ri.Error(ERR_DROP, "SHADER_MAX_VERTEXES hit in DrawSkySideVBO()\n"); + ri.Error(ERR_DROP, "SHADER_MAX_VERTEXES hit in DrawSkySideVBO()"); } } } @@ -404,7 +404,7 @@ static void DrawSkySide( struct image_s *image, const int mins[2], const int max { if (tess.numIndexes + 6 >= SHADER_MAX_INDEXES) { - ri.Error(ERR_DROP, "SHADER_MAX_INDEXES hit in DrawSkySideVBO()\n"); + ri.Error(ERR_DROP, "SHADER_MAX_INDEXES hit in DrawSkySideVBO()"); } tess.indexes[tess.numIndexes++] = s + t * (maxs[0] - mins[0] + 1) + firstVertex; diff --git a/src/rend2/tr_vbo.c b/src/rend2/tr_vbo.c index 65946f18..483df2e3 100644 --- a/src/rend2/tr_vbo.c +++ b/src/rend2/tr_vbo.c @@ -49,11 +49,11 @@ VBO_t *R_CreateVBO(const char *name, byte * vertexes, int vertexesSize, if(strlen(name) >= MAX_QPATH) { - ri.Error(ERR_DROP, "R_CreateVBO: \"%s\" is too long\n", name); + ri.Error(ERR_DROP, "R_CreateVBO: \"%s\" is too long", name); } if ( tr.numVBOs == MAX_VBOS ) { - ri.Error( ERR_DROP, "R_CreateVBO: MAX_VBOS hit\n"); + ri.Error( ERR_DROP, "R_CreateVBO: MAX_VBOS hit"); } R_IssuePendingRenderCommands(); @@ -117,11 +117,11 @@ VBO_t *R_CreateVBO2(const char *name, int numVertexes, srfVert_t * vert if(strlen(name) >= MAX_QPATH) { - ri.Error(ERR_DROP, "R_CreateVBO2: \"%s\" is too long\n", name); + ri.Error(ERR_DROP, "R_CreateVBO2: \"%s\" is too long", name); } if ( tr.numVBOs == MAX_VBOS ) { - ri.Error( ERR_DROP, "R_CreateVBO2: MAX_VBOS hit\n"); + ri.Error( ERR_DROP, "R_CreateVBO2: MAX_VBOS hit"); } R_IssuePendingRenderCommands(); @@ -466,11 +466,11 @@ IBO_t *R_CreateIBO(const char *name, byte * indexes, int indexesSize, v if(strlen(name) >= MAX_QPATH) { - ri.Error(ERR_DROP, "R_CreateIBO: \"%s\" is too long\n", name); + ri.Error(ERR_DROP, "R_CreateIBO: \"%s\" is too long", name); } if ( tr.numIBOs == MAX_IBOS ) { - ri.Error( ERR_DROP, "R_CreateIBO: MAX_IBOS hit\n"); + ri.Error( ERR_DROP, "R_CreateIBO: MAX_IBOS hit"); } R_IssuePendingRenderCommands(); @@ -534,11 +534,11 @@ IBO_t *R_CreateIBO2(const char *name, int numTriangles, srfTriangle_t * if(strlen(name) >= MAX_QPATH) { - ri.Error(ERR_DROP, "R_CreateIBO2: \"%s\" is too long\n", name); + ri.Error(ERR_DROP, "R_CreateIBO2: \"%s\" is too long", name); } if ( tr.numIBOs == MAX_IBOS ) { - ri.Error( ERR_DROP, "R_CreateIBO2: MAX_IBOS hit\n"); + ri.Error( ERR_DROP, "R_CreateIBO2: MAX_IBOS hit"); } R_IssuePendingRenderCommands(); |