Merge a50e15effbf54ea113d4fcb565c2137201f03677 into a6139bc44d641d28bd57fa419d83c707494706c4

src/camera.cpp

@@ -216,8 +216,10 @@ cameraSync(ObjectWithFrame *obj)
 	inv.at.x = -inv.at.x;
 	inv.pos.x = -inv.pos.x;
 
-	float32 xscl = 1.0f/(2.0f*cam->viewWindow.x);
+	V2d dpiScale = engine->device.dpiScale(cam->frameBuffer->width, cam->frameBuffer->height);
-	float32 yscl = 1.0f/(2.0f*cam->viewWindow.y);
+
+	float32 xscl = 1.0f/(2.0f*cam->viewWindow.x*dpiScale.x);
+	float32 yscl = 1.0f/(2.0f*cam->viewWindow.y*dpiScale.y);
 
 	proj.flags = 0;
 	proj.right.x = xscl;

src/d3d/d3ddevice.cpp

@@ -2014,6 +2014,7 @@ Device renderdevice = {
 	d3d::im3DRenderPrimitive,
 	d3d::im3DRenderIndexedPrimitive,
 	d3d::im3DEnd,
+	null::dpiScale,
 	d3d::deviceSystem,
 };
 

src/engine.cpp

@@ -566,6 +566,7 @@ Device renderdevice = {
 	null::im3DRenderPrimitive,
 	null::im3DRenderIndexedPrimitive,
 	null::im3DEnd,
+	null::dpiScale,
 	null::deviceSystem
 };
 

src/gl/gl3device.cpp

@@ -1311,8 +1311,9 @@ beginUpdate(Camera *cam)
 	setViewMatrix(view);
 
 	// Projection Matrix
-	float32 invwx = 1.0f/cam->viewWindow.x;
+	V2d dpiScale = engine->device.dpiScale(cam->frameBuffer->width, cam->frameBuffer->height);
-	float32 invwy = 1.0f/cam->viewWindow.y;
+	float32 invwx = 1.0f/cam->viewWindow.x/dpiScale.x;
+	float32 invwy = 1.0f/cam->viewWindow.y/dpiScale.y;
 	float32 invz = 1.0f/(cam->farPlane-cam->nearPlane);
 
 	proj[0] = invwx;
@@ -1421,6 +1422,26 @@ showRaster(Raster *raster, uint32 flags)
 #endif
 }
 
+static V2d dpiScale(float x, float y)
+{
+//TODO SDL2 version of this
+#ifdef LIBRW_SDL2
+	V2d v;
+	v.set(1.f, 1.f);
+	return v;
+#else
+	V2d v;
+	int w = 0;
+        int h = 0;
+        glfwGetFramebufferSize(glGlobals.window, &w, &h);
+	if (w && h)
+		v.set(w / x, h / y);
+	else
+		v.set(1,1);
+	return v;
+#endif
+}
+
 static bool32
 rasterRenderFast(Raster *raster, int32 x, int32 y)
 {
@@ -1428,6 +1449,7 @@ rasterRenderFast(Raster *raster, int32 x, int32 y)
 	Raster *dst = Raster::getCurrentContext();
 	Gl3Raster *natdst = PLUGINOFFSET(Gl3Raster, dst, nativeRasterOffset);
 	Gl3Raster *natsrc = PLUGINOFFSET(Gl3Raster, src, nativeRasterOffset);
+	V2d dpiScale = engine->device.dpiScale(src->width, src->height);
 
 	switch(dst->type){
 	case Raster::NORMAL:
@@ -1437,8 +1459,11 @@ rasterRenderFast(Raster *raster, int32 x, int32 y)
 		case Raster::CAMERA:
 			setActiveTexture(0);
 			glBindTexture(GL_TEXTURE_2D, natdst->texid);
+			
 			glCopyTexSubImage2D(GL_TEXTURE_2D, 0, x, (dst->height-src->height)-y,
-				0, 0, src->width, src->height);
+			src->width - src->width/dpiScale.x, src->height - src->height/dpiScale.y,
+			src->width, src->height);
+
 			glBindTexture(GL_TEXTURE_2D, boundTexture[0]);
 			return 1;
 		}
@@ -2090,6 +2115,7 @@ Device renderdevice = {
 	gl3::im3DRenderPrimitive,
 	gl3::im3DRenderIndexedPrimitive,
 	gl3::im3DEnd,
+	gl3::dpiScale,
 #ifdef LIBRW_SDL2
 	gl3::deviceSystemSDL2
 #else

src/ps2/ps2device.cpp

@@ -40,6 +40,7 @@ Device renderdevice = {
 	null::im3DRenderPrimitive,
 	null::im3DRenderIndexedPrimitive,
 	null::im3DEnd,
+	null::dpiScale,
 	null::deviceSystem
 };
 

src/rwengine.h

@@ -66,6 +66,7 @@ struct Device
 	void (*im3DRenderIndexedPrimitive)(PrimitiveType primType, void *indices, int32 numIndices);
 	void (*im3DEnd)(void);
 
+	V2d (*dpiScale)(float x, float y);
 	DeviceSystem *system;
 };
 
@@ -267,6 +268,13 @@ namespace null {
 	void im3DRenderIndexedPrimitive(PrimitiveType primType, void *indices, int32 numIndices);
 	void im3DEnd(void);
 
+	inline V2d dpiScale(float,float)
+	{
+		V2d s;
+		s.set(1.f, 1.f);
+		return s;
+	}
+
 	int deviceSystem(DeviceReq req, void *arg0, int32 n);
 
 	extern Device renderdevice;