mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-10 03:44:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow GLES3 hardware to support FSAA. Need a GUI option for this on Android devices.

Browse Source
This commit is contained in:
Ryan Houdek 2013-09-22 13:54:47 +00:00
parent eb2e3cff7e
commit 53b93f8cd5
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
View File

@ -99,7 +99,6 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
GL_REPORT_FBO_ERROR(); GL_REPORT_FBO_ERROR();
} }
#ifndef USE_GLES3
else else
{ {
// EFB targets will be renderbuffers in MSAA mode (required by OpenGL). // EFB targets will be renderbuffers in MSAA mode (required by OpenGL).
@ -150,7 +149,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
glBindTexture(getFbType(), m_resolvedDepthTexture); glBindTexture(getFbType(), m_resolvedDepthTexture);
glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0); glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
glTexImage2D(getFbType(), 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL); glTexImage2D(getFbType(), 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
// Bind resolved textures to resolved framebuffer. // Bind resolved textures to resolved framebuffer.
@ -165,7 +164,6 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer); glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer);
} }
#endif
// Create XFB framebuffer; targets will be created elsewhere. // Create XFB framebuffer; targets will be created elsewhere.
glGenFramebuffers(1, &m_xfbFramebuffer); glGenFramebuffers(1, &m_xfbFramebuffer);

4
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -141,7 +141,6 @@ void OpenGL_ReportARBProgramError()
bool OpenGL_ReportFBOError(const char *function, const char *file, int line) bool OpenGL_ReportFBOError(const char *function, const char *file, int line)
{ {
#ifndef USE_GLES
unsigned int fbo_status = glCheckFramebufferStatus(GL_FRAMEBUFFER); unsigned int fbo_status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
if (fbo_status != GL_FRAMEBUFFER_COMPLETE) if (fbo_status != GL_FRAMEBUFFER_COMPLETE)
{ {
@ -154,12 +153,14 @@ bool OpenGL_ReportFBOError(const char *function, const char *file, int line)
case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
error = "INCOMPLETE_MISSING_ATTACHMENT"; error = "INCOMPLETE_MISSING_ATTACHMENT";
break; break;
#ifndef USE_GLES
case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER: case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
error = "INCOMPLETE_DRAW_BUFFER"; error = "INCOMPLETE_DRAW_BUFFER";
break; break;
case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER: case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
error = "INCOMPLETE_READ_BUFFER"; error = "INCOMPLETE_READ_BUFFER";
break; break;
#endif
case GL_FRAMEBUFFER_UNSUPPORTED: case GL_FRAMEBUFFER_UNSUPPORTED:
error = "UNSUPPORTED"; error = "UNSUPPORTED";
break; break;
@ -168,7 +169,6 @@ bool OpenGL_ReportFBOError(const char *function, const char *file, int line)
file, line, function, error); file, line, function, error);
return false; return false;
} }
#endif
return true; return true;
} }

1
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
View File

@ -32,6 +32,7 @@
#define GL_BGRA GL_RGBA #define GL_BGRA GL_RGBA
#define glDrawElementsBaseVertex(...) #define glDrawElementsBaseVertex(...)
#define glDrawRangeElementsBaseVertex(...) #define glDrawRangeElementsBaseVertex(...)
#define glRenderbufferStorageMultisampleCoverageNV(...)
#endif #endif
#else #else
#define TEX2D GL_TEXTURE_RECTANGLE_ARB #define TEX2D GL_TEXTURE_RECTANGLE_ARB