X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fgui%2Fglwidget.cpp;h=d0e1934ed32a84a2a3499979522bd63ead26fe32;hb=85fb2fe5f5a002a261e6b873b8393e085990a700;hp=9788bc3b4f65e53cc6cd5fb039e01f3ee827b59d;hpb=438d3a52ef0af04ac3279c0839fe6ffd7333b776;p=virtualjaguar diff --git a/src/gui/glwidget.cpp b/src/gui/glwidget.cpp index 9788bc3..d0e1934 100644 --- a/src/gui/glwidget.cpp +++ b/src/gui/glwidget.cpp @@ -34,7 +34,7 @@ GLWidget::GLWidget(QWidget * parent/*= 0*/): QGLWidget(parent), texture(0), GLWidget::~GLWidget() { - delete[] backbuffer; + free(backbuffer); } void GLWidget::initializeGL() @@ -71,9 +71,12 @@ rasterHeight = (vjs.hardwareTypeNTSC ? 240 : 256); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, (vjs.glFilter ? GL_LINEAR : GL_NEAREST)); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, (vjs.glFilter ? GL_LINEAR : GL_NEAREST)); // glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, rasterWidth, rasterHeight, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, buffer); - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, rasterWidth, rasterHeight, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, buffer); +//more kludge + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, TOMGetVideoModeWidth(), rasterHeight, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, buffer); +// glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, rasterWidth, rasterHeight, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, buffer); - double w = (double)rasterWidth / (double)textureWidth; + double w = (double)TOMGetVideoModeWidth() / (double)textureWidth; +// double w = (double)rasterWidth / (double)textureWidth; double h = (double)rasterHeight / (double)textureHeight; unsigned u = outputWidth; unsigned v = outputHeight;