From: havoc Date: Wed, 14 Jul 2010 10:13:01 +0000 (+0000) Subject: fix more mingw warnings X-Git-Tag: xonotic-v0.1.0preview~230^2~157 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fb5629acb1f2686c39bfb4993ffd86b0094b8bbb;p=xonotic%2Fdarkplaces.git fix more mingw warnings git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10321 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/gl_backend.c b/gl_backend.c index 515085a9..a549db88 100644 --- a/gl_backend.c +++ b/gl_backend.c @@ -1079,6 +1079,12 @@ static void GL_Backend_ResetState(void) } #endif break; + case RENDERPATH_D3D10: + Con_DPrintf("FIXME D3D10 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__); + break; + case RENDERPATH_D3D11: + Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__); + break; case RENDERPATH_GL20: case RENDERPATH_CGGL: CHECKGLERROR @@ -3357,6 +3363,10 @@ void R_Mesh_PrepareVertices_Position_Arrays(int numvertices, const float *vertex if (vid.texunits >= 3) R_Mesh_TexCoordPointer(2, 2, GL_FLOAT, sizeof(float[2]), NULL, NULL, 0); return; + case RENDERPATH_D3D9: + case RENDERPATH_D3D10: + case RENDERPATH_D3D11: + break; } // no quick path for this case, convert to vertex structs @@ -3425,6 +3435,10 @@ void R_Mesh_PrepareVertices_Position(int numvertices, const r_vertexposition_t * R_Mesh_ColorPointer(4, GL_FLOAT, sizeof(float[4]), NULL, NULL, 0); R_Mesh_TexCoordPointer(0, 2, GL_FLOAT, sizeof(float[2]), NULL, NULL, 0); break; + case RENDERPATH_D3D9: + case RENDERPATH_D3D10: + case RENDERPATH_D3D11: + break; } } @@ -3486,6 +3500,10 @@ void R_Mesh_PrepareVertices_Generic_Arrays(int numvertices, const float *vertex3 return; } break; + case RENDERPATH_D3D9: + case RENDERPATH_D3D10: + case RENDERPATH_D3D11: + break; } // no quick path for this case, convert to vertex structs @@ -3574,6 +3592,10 @@ void R_Mesh_PrepareVertices_Generic(int numvertices, const r_vertexgeneric_t *ve R_Mesh_ColorPointer( 4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub , NULL, 0); R_Mesh_TexCoordPointer(0, 2, GL_FLOAT , sizeof(*vertex), vertex->texcoord2f , NULL, 0); break; + case RENDERPATH_D3D9: + case RENDERPATH_D3D10: + case RENDERPATH_D3D11: + break; } } @@ -3635,6 +3657,10 @@ void R_Mesh_PrepareVertices_Mesh_Arrays(int numvertices, const float *vertex3f, return; } break; + case RENDERPATH_D3D9: + case RENDERPATH_D3D10: + case RENDERPATH_D3D11: + break; } vertex = R_Mesh_PrepareVertices_Mesh_Lock(numvertices); @@ -3744,5 +3770,9 @@ void R_Mesh_PrepareVertices_Mesh(int numvertices, const r_vertexmesh_t *vertex, R_Mesh_ColorPointer( 4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub , NULL, 0); R_Mesh_TexCoordPointer(0, 2, GL_FLOAT , sizeof(*vertex), vertex->texcoordtexture2f , NULL, 0); break; + case RENDERPATH_D3D9: + case RENDERPATH_D3D10: + case RENDERPATH_D3D11: + break; } }