all repos — mgba @ b81f045d27f5ecdfc70b068c2031c46cf10d3144

mGBA Game Boy Advance Emulator

Qt: DisplayGL cleanup
Jeffrey Pfau jeffrey@endrift.com
Sat, 18 Apr 2015 03:49:48 -0700
commit

b81f045d27f5ecdfc70b068c2031c46cf10d3144

parent

d4ab0564eb899da268cddf81daa65e5d00887f2d

2 files changed, 3 insertions(+), 5 deletions(-)

jump to
M src/platform/qt/DisplayGL.cppsrc/platform/qt/DisplayGL.cpp

@@ -139,16 +139,15 @@ m_context = context;

} void Painter::setBacking(const uint32_t* backing) { - m_backing = backing; makeCurrent(); #ifdef COLOR_16_BIT #ifdef COLOR_5_6_5 - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, m_backing); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, backing); #else - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, m_backing); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, backing); #endif #else - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, m_backing); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, backing); #endif doneCurrent(); }
M src/platform/qt/DisplayGL.hsrc/platform/qt/DisplayGL.h

@@ -74,7 +74,6 @@ void performDraw();

QTimer* m_drawTimer; GBAThread* m_context; - const uint32_t* m_backing; GLuint m_tex; QSize m_size; bool m_lockAspectRatio;