X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fglwidget.cpp;h=2501ad8296a1d100c9bd3a2815718ef675edc878;hb=828059a53ae8bfb03ade4acd1e62c8de9be89775;hp=d4a65ec59568986c4555ad9cbe767bbbba9692ef;hpb=5e11cea96160bd958c1b271940bf97ecfa257b15;p=virtualjaguar

diff --git a/src/gui/glwidget.cpp b/src/gui/glwidget.cpp
index d4a65ec..2501ad8 100644
--- a/src/gui/glwidget.cpp
+++ b/src/gui/glwidget.cpp
@@ -13,16 +13,33 @@
 
 #include "glwidget.h"
 
+#include "jaguar.h"
 #include "settings.h"
+#include "tom.h"
+
+#ifdef __GCCWIN32__
+// Apparently on win32, various OpenGL constants aren't pulled in.
+#include <GL/glext.h>
+#endif
 
 GLWidget::GLWidget(QWidget * parent/*= 0*/): QGLWidget(parent), texture(0),
-	textureWidth(0), textureHeight(0), buffer(0), rasterWidth(64), rasterHeight(64)
-//	textureWidth(0), textureHeight(0), buffer(0), rasterWidth(256), rasterHeight(256)
+	textureWidth(0), textureHeight(0), buffer(0), rasterWidth(320), rasterHeight(240)
 {
+//	tomDeviceWidth = rasterWidth;
+	tomDeviceWidth = 1024;	// It has to be the texture width...
+
+	// Set up the backbuffer
+	// To be safe, this should be 1280 * 625 * 2...
+	backbuffer = (uint32_t *)malloc(1280 * 625 * sizeof(uint32_t));
+//	memset(backbuffer, 0x44, rasterWidth *
+	memset(backbuffer, 0xFF, 1024 *
+		(vjs.hardwareTypeNTSC ? rasterHeight : VIRTUAL_SCREEN_HEIGHT_PAL)
+		* sizeof(uint32_t));
 }
 
 GLWidget::~GLWidget()
 {
+	free(backbuffer);
 }
 
 void GLWidget::initializeGL()
@@ -42,6 +59,9 @@ void GLWidget::initializeGL()
 
 void GLWidget::paintGL()
 {
+//kludge
+rasterHeight = (vjs.hardwareTypeNTSC ? 240 : 256);
+
 	unsigned outputWidth  = width();
 	unsigned outputHeight = height();
 
@@ -56,9 +76,12 @@ void GLWidget::paintGL()
 	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;
@@ -94,6 +117,8 @@ printf("Resizing: new raster width/height = %i x %i\n", rasterWidth, rasterHeigh
 		}
 
 		buffer = new uint32_t[textureWidth * textureHeight];
+//???
+memset(buffer, 0x00, textureWidth * textureHeight * sizeof(uint32_t));
 		glGenTextures(1, &texture);
 		glBindTexture(GL_TEXTURE_2D, texture);
 		glPixelStorei(GL_UNPACK_ROW_LENGTH, textureWidth);