From c43b1c18e59da601a7655a302a65de3006f08c55 Mon Sep 17 00:00:00 2001 From: "sl1nk3.s" Date: Fri, 10 Apr 2009 21:12:34 +0000 Subject: [PATCH] build fix + fix for issue 850 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2953 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp index bef5996a08..394a02e3d5 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp @@ -235,7 +235,7 @@ void Flush() if (numVertices) { // set global constants - VertexShaderManager::SetConstants(false); + VertexShaderManager::SetConstants(false, false); PixelShaderManager::SetConstants(); PixelShaderCache::SetShader(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index d0db0871ac..482e275e5c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1090,6 +1090,7 @@ void Renderer::Swap(const TRectangle& rc) glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + /* static const float vtx_data[8] = {-1, -1, -1, 1, 1, 1, 1, -1}; const float uv_data[8] = {0, v_min, 0, v_max, u_max, v_max, u_max, v_min}; glBindBuffer(GL_ARRAY_BUFFER, 0); @@ -1097,6 +1098,14 @@ void Renderer::Swap(const TRectangle& rc) glVertexPointer(2, GL_FLOAT, 0, (void *)vtx_data); glTexCoordPointer(2, GL_FLOAT, 0, (void *)uv_data); glDrawArrays(GL_QUADS, 0, 4); + */ + + glBegin(GL_QUADS); + glTexCoord2f(0, v_min); glVertex2f(-1, -1); + glTexCoord2f(0, v_max); glVertex2f(-1, 1); + glTexCoord2f(u_max, v_max); glVertex2f( 1, 1); + glTexCoord2f(u_max, v_min); glVertex2f( 1, -1); + glEnd(); glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); TextureMngr::DisableStage(0);