diff options
| author | nakeee <nakeee@gmail.com> | 2008-11-26 21:41:17 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2008-11-26 21:41:17 +0000 |
| commit | 138e2200067dc65d0f0883a338935da2eab6b158 (patch) | |
| tree | 547b5417d4a82a804452324cf810a72b9cfd55ab /Source | |
| parent | e8b0757ee73fc97245a2af21657abca29e41138e (diff) | |
Didn't replace all the instances
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1309 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp index 89c46d9cde..d942d8c78c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp @@ -89,25 +89,25 @@ void NativeVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl) CallCdeclFunction4_I(glVertexPointer, 3, GL_FLOAT, _vtx_decl.stride, 0);
- if (vtx_decl.num_normals >= 1) {
- CallCdeclFunction3_I(glNormalPointer, VarToGL(vtx_decl.normal_gl_type), _vtx_decl.stride, vtx_decl.normal_offset[0]);
- if (vtx_decl.num_normals == 3) {
- CallCdeclFunction6((void *)glVertexAttribPointer, SHADER_NORM1_ATTRIB, vtx_decl.normal_gl_size, VarToGL(vtx_decl.normal_gl_type), GL_TRUE, _vtx_decl.stride, vtx_decl.normal_offset[1]);
- CallCdeclFunction6((void *)glVertexAttribPointer, SHADER_NORM2_ATTRIB, vtx_decl.normal_gl_size, VarToGL(vtx_decl.normal_gl_type), GL_TRUE, _vtx_decl.stride, vtx_decl.normal_offset[2]);
+ if (_vtx_decl.num_normals >= 1) {
+ CallCdeclFunction3_I(glNormalPointer, VarToGL(_vtx_decl.normal_gl_type), _vtx_decl.stride, _vtx_decl.normal_offset[0]);
+ if (_vtx_decl.num_normals == 3) {
+ CallCdeclFunction6((void *)glVertexAttribPointer, SHADER_NORM1_ATTRIB, _vtx_decl.normal_gl_size, VarToGL(_vtx_decl.normal_gl_type), GL_TRUE, _vtx_decl.stride, _vtx_decl.normal_offset[1]);
+ CallCdeclFunction6((void *)glVertexAttribPointer, SHADER_NORM2_ATTRIB, _vtx_decl.normal_gl_size, VarToGL(_vtx_decl.normal_gl_type), GL_TRUE, _vtx_decl.stride, _vtx_decl.normal_offset[2]);
}
}
for (int i = 0; i < 2; i++) {
- if (vtx_decl.color_offset[i] != -1) {
+ if (_vtx_decl.color_offset[i] != -1) {
if (i == 0)
- CallCdeclFunction4_I(glColorPointer, 4, GL_UNSIGNED_BYTE, _vtx_decl.stride, vtx_decl.color_offset[i]);
+ CallCdeclFunction4_I(glColorPointer, 4, GL_UNSIGNED_BYTE, _vtx_decl.stride, _vtx_decl.color_offset[i]);
else
- CallCdeclFunction4((void *)glSecondaryColorPointer, 4, GL_UNSIGNED_BYTE, _vtx_decl.stride, vtx_decl.color_offset[i]);
+ CallCdeclFunction4((void *)glSecondaryColorPointer, 4, GL_UNSIGNED_BYTE, _vtx_decl.stride, _vtx_decl.color_offset[i]);
}
}
for (int i = 0; i < 8; i++) {
- if (vtx_decl.texcoord_offset[i] != -1) {
+ if (_vtx_decl.texcoord_offset[i] != -1) {
int id = GL_TEXTURE0 + i;
#ifdef _M_X64
#ifdef _MSC_VER
@@ -128,13 +128,13 @@ void NativeVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl) #endif
#endif
CallCdeclFunction4_I(
- glTexCoordPointer, vtx_decl.texcoord_size[i], VarToGL(vtx_decl.texcoord_gl_type[i]),
- _vtx_decl.stride, vtx_decl.texcoord_offset[i]);
+ glTexCoordPointer, _vtx_decl.texcoord_size[i], VarToGL(_vtx_decl.texcoord_gl_type[i]),
+ _vtx_decl.stride, _vtx_decl.texcoord_offset[i]);
}
}
- if (vtx_decl.posmtx_offset != -1) {
- CallCdeclFunction6((void *)glVertexAttribPointer, SHADER_POSMTX_ATTRIB, 4, GL_UNSIGNED_BYTE, GL_FALSE, _vtx_decl.stride, vtx_decl.posmtx_offset);
+ if (_vtx_decl.posmtx_offset != -1) {
+ CallCdeclFunction6((void *)glVertexAttribPointer, SHADER_POSMTX_ATTRIB, 4, GL_UNSIGNED_BYTE, GL_FALSE, _vtx_decl.stride, _vtx_decl.posmtx_offset);
}
ABI_EmitEpilogue(6);
@@ -145,7 +145,7 @@ void NativeVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl) SetCodePtr(old_code_ptr);
#endif
- this->vtx_decl = vtx_decl;
+ this->vtx_decl = _vtx_decl;
}
void NativeVertexFormat::SetupVertexPointers() const {
|