From 60181c33040d6538a180d59536840628454d5e84 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Tue, 14 May 2024 16:37:56 -0500 Subject: [PATCH] test build 5 square only handling --- src/engine/engine.h | 4 ++-- src/gui/render/renderDX9.cpp | 11 +++++++++++ src/gui/render/renderDX9.h | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/engine/engine.h b/src/engine/engine.h index 230b8daee..b808e26e9 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -54,8 +54,8 @@ class DivWorkPool; #define DIV_UNSTABLE -#define DIV_VERSION "DX9 Test IV" -#define DIV_ENGINE_VERSION 205 +#define DIV_VERSION "DX9 Test V" +#define DIV_ENGINE_VERSION 206 // for imports #define DIV_VERSION_MOD 0xff01 #define DIV_VERSION_FC 0xff02 diff --git a/src/gui/render/renderDX9.cpp b/src/gui/render/renderDX9.cpp index 81bb57859..2e81a2a2b 100644 --- a/src/gui/render/renderDX9.cpp +++ b/src/gui/render/renderDX9.cpp @@ -156,6 +156,13 @@ FurnaceGUITexture* FurnaceGUIRenderDX9::createTexture(bool dynamic, int width, i if ((heightReal&(heightReal-1))!=0) { heightReal=1<heightReal) { + heightReal=widthReal; + } else { + widthReal=heightReal; + } + } logV("width: %d (requested)... %d (actual)",width,widthReal); logV("height: %d (requested)... %d (actual)",height,heightReal); @@ -407,6 +414,7 @@ bool FurnaceGUIRenderDX9::init(SDL_Window* win, int swapInt) { if (result==D3D_OK) { supportsDynamicTex=(caps.Caps2&D3DCAPS2_DYNAMICTEXTURES); + squareTex=(caps.TextureCaps&D3DPTEXTURECAPS_SQUAREONLY); supportsVSync=(caps.PresentationIntervals&D3DPRESENT_INTERVAL_ONE); maxWidth=caps.MaxTextureWidth; maxHeight=caps.MaxTextureHeight; @@ -414,6 +422,9 @@ bool FurnaceGUIRenderDX9::init(SDL_Window* win, int swapInt) { if (!supportsDynamicTex) { logI("no support for dynamic textures"); } + if (squareTex) { + logI("square textures only"); + } } result=device->CreateVertexBuffer(sizeof(WipeVertex)*4,0,D3DFVF_XYZ|D3DFVF_DIFFUSE,D3DPOOL_DEFAULT,&wipeBuf,NULL); diff --git a/src/gui/render/renderDX9.h b/src/gui/render/renderDX9.h index c64db3e84..f412d1943 100644 --- a/src/gui/render/renderDX9.h +++ b/src/gui/render/renderDX9.h @@ -38,7 +38,7 @@ class FurnaceGUIRenderDX9: public FurnaceGUIRender { int outW, outH, swapInterval; - bool dead, haveScene, supportsDynamicTex, supportsVSync, mustResize; + bool dead, haveScene, supportsDynamicTex, supportsVSync, mustResize, squareTex; // SHADERS // @@ -93,6 +93,7 @@ class FurnaceGUIRenderDX9: public FurnaceGUIRender { supportsDynamicTex(false), supportsVSync(false), mustResize(false), + squareTex(false), maxWidth(8192), maxHeight(8192) { }