mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-05 07:39:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Instead of querying the vertex attribute location. Let's bind it to where CG expects it to be as well. Was causing problems when we were trying to activate the components below and they weren't available. This fixes cubivore with GLSL shader. Also any other game that uses 3 normal pointers.

Browse source
This commit is contained in:
Ryan Houdek 2011-12-11 06:18:01 -06:00 • committed by Sonicadvance1
commit ba12c0b4f5
3 changed files with 6 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
View file

@ -192,15 +192,8 @@ void GLVertexFormat::SetupVertexPointers() {
if (vtx_decl.num_normals >= 1) {
glNormalPointer(VarToGL(vtx_decl.normal_gl_type), vtx_decl.stride, (void *)(VertexManager::s_pBaseBufferPointer + vtx_decl.normal_offset[0]));
if (vtx_decl.num_normals == 3) {
GLint varLocation1 = SHADER_NORM1_ATTRIB, varLocation2 = SHADER_NORM2_ATTRIB;
if(g_ActiveConfig.bUseGLSL){
varLocation1 = OGL::ProgramShaderCache::GetAttr(0);
varLocation2 = OGL::ProgramShaderCache::GetAttr(1);
}
if(varLocation1 > 0)
glVertexAttribPointer(varLocation1, vtx_decl.normal_gl_size, VarToGL(vtx_decl.normal_gl_type), GL_TRUE, vtx_decl.stride, (void *)(VertexManager::s_pBaseBufferPointer + vtx_decl.normal_offset[1]));
if(varLocation2 > 0)
glVertexAttribPointer(varLocation2, vtx_decl.normal_gl_size, VarToGL(vtx_decl.normal_gl_type), GL_TRUE, vtx_decl.stride, (void *)(VertexManager::s_pBaseBufferPointer + vtx_decl.normal_offset[2]));
glVertexAttribPointer(SHADER_NORM1_ATTRIB, vtx_decl.normal_gl_size, VarToGL(vtx_decl.normal_gl_type), GL_TRUE, vtx_decl.stride, (void *)(VertexManager::s_pBaseBufferPointer + vtx_decl.normal_offset[1]));
glVertexAttribPointer(SHADER_NORM2_ATTRIB, vtx_decl.normal_gl_size, VarToGL(vtx_decl.normal_gl_type), GL_TRUE, vtx_decl.stride, (void *)(VertexManager::s_pBaseBufferPointer + vtx_decl.normal_offset[2]));
}
}
@ -224,11 +217,7 @@ void GLVertexFormat::SetupVertexPointers() {
}
if (vtx_decl.posmtx_offset != -1) {
GLint varLocation = SHADER_POSMTX_ATTRIB;
if(g_ActiveConfig.bUseGLSL)
varLocation = OGL::ProgramShaderCache::GetAttr(2);
if(varLocation > 0)
glVertexAttribPointer(varLocation, 4, GL_UNSIGNED_BYTE, GL_FALSE, vtx_decl.stride, (void *)(VertexManager::s_pBaseBufferPointer + vtx_decl.posmtx_offset));
glVertexAttribPointer(SHADER_POSMTX_ATTRIB, 4, GL_UNSIGNED_BYTE, GL_FALSE, vtx_decl.stride, (void *)(VertexManager::s_pBaseBufferPointer + vtx_decl.posmtx_offset));
}
#endif
}