diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-07-13 17:24:23 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-07-13 17:24:23 -0500 |
| commit | 737df2a68cd5c5cdfa1e73cede0dbf85bde01abc (patch) | |
| tree | c1aae182867da795ce0016c46fa4b58accb15071 /Source/Core | |
| parent | 52cb398804a4f7f4e31e2040bbabd1bf90c581f6 (diff) | |
Patch from Degasus that removes the last of the the GL_TEXTURE_RECTANGLE usages. This is needed to have GLES3 support.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/GLInterface/EGL.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 50266d7f84..488b2fdec6 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -666,7 +666,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc { char ppcInst[256]; DisassembleGekko(ops[i].inst.hex, em_address, ppcInst, 256); - NOTICE_LOG(DYNA_REC, "Unflushed register: %s", ppcInst); + //NOTICE_LOG(DYNA_REC, "Unflushed register: %s", ppcInst); } #endif if (js.skipnext) { diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.h b/Source/Core/DolphinWX/Src/GLInterface/EGL.h index cf218ad760..cd0969c4b7 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.h +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.h @@ -18,7 +18,11 @@ #define _INTERFACEEGL_H_ #if USE_GLES +#ifdef USE_GLES3 +#include <GLES3/gl3.h> +#else #include <GLES2/gl2.h> +#endif #else #include <GL/glxew.h> #include <GL/gl.h> |