piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'arb_framebuffer' into GLSL-master

Browse Source 
Conflicts:
	Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
This commit is contained in:
degasus
2013-01-09 11:00:26 +01:00
parent b7906b49c9 84debc17d5
commit bff02b3b73
34 changed files with 300 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp
View File

@ -355,7 +355,7 @@ namespace EfbInterface
dstClr = (~srcClr) & dstClr;
break;
case 5: // noop
dstClr = dstClr;
// Do nothing
break;
case 6: // xor
dstClr = srcClr ^ dstClr;

2
Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp
View File

@ -62,7 +62,7 @@ namespace HwRasterizer
"}\n";
// Clear shader
static const char *fragclearText =
"uniform vec4 Color;\n"
"uniform " PREC " vec4 Color;\n"
"void main() {\n"
" gl_FragColor = Color;\n"
"}\n";

6
Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
View File

@ -146,9 +146,6 @@ void SWRenderer::DrawTexture(u8 *texture, int width, int height)
glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture);
glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(TEX2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
GLfloat u_max = (GLfloat)width;
GLfloat v_max = (GLfloat)glHeight;
static const GLfloat verts[4][2] = {
{ -1, -1}, // Left top
@ -158,6 +155,9 @@ void SWRenderer::DrawTexture(u8 *texture, int width, int height)
};
//Texture rectangle uses pixel coordinates
#ifndef USE_GLES
GLfloat u_max = (GLfloat)width;
GLfloat v_max = (GLfloat)height;
static const GLfloat texverts[4][2] = {
{0, v_max},
{0, 0},