mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 14:19:46 -06:00
build fix + fix for issue 850
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2953 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -235,7 +235,7 @@ void Flush()
|
|||||||
if (numVertices)
|
if (numVertices)
|
||||||
{
|
{
|
||||||
// set global constants
|
// set global constants
|
||||||
VertexShaderManager::SetConstants(false);
|
VertexShaderManager::SetConstants(false, false);
|
||||||
PixelShaderManager::SetConstants();
|
PixelShaderManager::SetConstants();
|
||||||
|
|
||||||
PixelShaderCache::SetShader();
|
PixelShaderCache::SetShader();
|
||||||
|
@ -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_MAG_FILTER, GL_LINEAR);
|
||||||
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_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};
|
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};
|
const float uv_data[8] = {0, v_min, 0, v_max, u_max, v_max, u_max, v_min};
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
||||||
@ -1097,6 +1098,14 @@ void Renderer::Swap(const TRectangle& rc)
|
|||||||
glVertexPointer(2, GL_FLOAT, 0, (void *)vtx_data);
|
glVertexPointer(2, GL_FLOAT, 0, (void *)vtx_data);
|
||||||
glTexCoordPointer(2, GL_FLOAT, 0, (void *)uv_data);
|
glTexCoordPointer(2, GL_FLOAT, 0, (void *)uv_data);
|
||||||
glDrawArrays(GL_QUADS, 0, 4);
|
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);
|
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
|
||||||
TextureMngr::DisableStage(0);
|
TextureMngr::DisableStage(0);
|
||||||
|
Reference in New Issue
Block a user