From 8b7141d3de3f4791b118a2f63b76b56da40e812d Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 26 Feb 2013 08:57:35 +0100 Subject: [PATCH] Revert "Fix performance issues on certain legacy graphics hardware that isn't capable of copying an integer." This reverts commit 380f22ca0eeab998d4c73cb3a4116bd98d62e1ea. Yeah, reverting a revert. --- Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 6 +----- Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index a84d680855..a657a68b2d 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -208,7 +208,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType) { WRITE(p, "ATTRIN float4 rawpos; // ATTR%d,\n", SHADER_POSITION_ATTRIB); if (components & VB_HAS_POSMTXIDX) - WRITE(p, "ATTRIN float fposmtx; // ATTR%d,\n", SHADER_POSMTX_ATTRIB); + WRITE(p, "ATTRIN int posmtx; // ATTR%d,\n", SHADER_POSMTX_ATTRIB); if (components & VB_HAS_NRM0) WRITE(p, "ATTRIN float3 rawnorm0; // ATTR%d,\n", SHADER_NORM0_ATTRIB); if (components & VB_HAS_NRM1) @@ -305,10 +305,6 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType) { WRITE(p, "int posmtx = blend_indices.x * 255.0f;\n"); } - else - { - WRITE(p, "int posmtx = int(fposmtx);\n"); - } WRITE(p, "float4 pos = float4(dot(" I_TRANSFORMMATRICES"[posmtx], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+1], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+2], rawpos), 1);\n"); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp index 954a92b126..b2058cf089 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp @@ -100,7 +100,7 @@ void GLVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl) if (vtx_decl.posmtx_offset != -1) { glEnableVertexAttribArray(SHADER_POSMTX_ATTRIB); - glVertexAttribPointer(SHADER_POSMTX_ATTRIB, 4, GL_UNSIGNED_BYTE, GL_FALSE, vtx_decl.stride, (u8*)NULL + vtx_decl.posmtx_offset); + glVertexAttribIPointer(SHADER_POSMTX_ATTRIB, 4, GL_UNSIGNED_BYTE, vtx_decl.stride, (u8*)NULL + vtx_decl.posmtx_offset); } vm->m_last_vao = VAO;