isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-11 18:41:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renderer clean up (#228)

Browse Source
This commit is contained in:
Anders Jenbo 2025-06-04 02:21:06 +02:00 committed by GitHub
parent e349842ea4
commit 0ac7fee23c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
miniwin/src/d3drm/backends/opengl15/renderer.cpp
View File

@ -92,11 +92,6 @@ OpenGL15Renderer::~OpenGL15Renderer()
} }
} }
void OpenGL15Renderer::SetBackbuffer(SDL_Surface* surface)
{
m_backbuffer = surface;
}
void OpenGL15Renderer::PushVertices(const PositionColorVertex* verts, size_t count) void OpenGL15Renderer::PushVertices(const PositionColorVertex* verts, size_t count)
{ {
m_vertices.assign(verts, verts + count); m_vertices.assign(verts, verts + count);
@ -148,7 +143,7 @@ const char* OpenGL15Renderer::GetName()
HRESULT OpenGL15Renderer::Render() HRESULT OpenGL15Renderer::Render()
{ {
if (!m_backbuffer) { if (!DDBackBuffer) {
return DDERR_GENERIC; return DDERR_GENERIC;
} }
SDL_GL_MakeCurrent(DDWindow, m_context); SDL_GL_MakeCurrent(DDWindow, m_context);
@ -251,7 +246,7 @@ HRESULT OpenGL15Renderer::Render()
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
// Composite onto SDL backbuffer // Composite onto SDL backbuffer
SDL_BlitSurface(m_renderedImage, nullptr, m_backbuffer, nullptr); SDL_BlitSurface(m_renderedImage, nullptr, DDBackBuffer, nullptr);
return DD_OK; return DD_OK;
} }

7
miniwin/src/d3drm/backends/sdl3gpu/renderer.cpp
View File

@ -200,11 +200,6 @@ Direct3DRMSDL3GPURenderer::~Direct3DRMSDL3GPURenderer()
SDL_DestroyGPUDevice(m_device); SDL_DestroyGPUDevice(m_device);
} }
void Direct3DRMSDL3GPURenderer::SetBackbuffer(SDL_Surface* buf)
{
m_backbuffer = buf;
}
void Direct3DRMSDL3GPURenderer::PushLights(const SceneLight* vertices, size_t count) void Direct3DRMSDL3GPURenderer::PushLights(const SceneLight* vertices, size_t count)
{ {
if (count > 3) { if (count > 3) {
@ -388,7 +383,7 @@ HRESULT Direct3DRMSDL3GPURenderer::Render()
SDL_DestroySurface(m_renderedImage); SDL_DestroySurface(m_renderedImage);
SDL_UnmapGPUTransferBuffer(m_device, m_downloadTransferBuffer); SDL_UnmapGPUTransferBuffer(m_device, m_downloadTransferBuffer);
m_renderedImage = convertedRender; m_renderedImage = convertedRender;
SDL_BlitSurface(m_renderedImage, nullptr, m_backbuffer, nullptr); SDL_BlitSurface(m_renderedImage, nullptr, DDBackBuffer, nullptr);
return DD_OK; return DD_OK;
} }

21
miniwin/src/d3drm/backends/software/renderer.cpp
View File

@ -14,11 +14,6 @@ Direct3DRMSoftwareRenderer::Direct3DRMSoftwareRenderer(DWORD width, DWORD height
m_zBuffer.resize(m_width * m_height); m_zBuffer.resize(m_width * m_height);
} }
void Direct3DRMSoftwareRenderer::SetBackbuffer(SDL_Surface* buf)
{
m_backbuffer = buf;
}
void Direct3DRMSoftwareRenderer::PushLights(const SceneLight* lights, size_t count) void Direct3DRMSoftwareRenderer::PushLights(const SceneLight* lights, size_t count)
{ {
m_lights.assign(lights, lights + count); m_lights.assign(lights, lights + count);
@ -292,8 +287,8 @@ void Direct3DRMSoftwareRenderer::DrawTriangleProjected(
} }
} }
Uint8* pixels = (Uint8*) m_backbuffer->pixels; Uint8* pixels = (Uint8*) DDBackBuffer->pixels;
int pitch = m_backbuffer->pitch; int pitch = DDBackBuffer->pitch;
for (int y = minY; y <= maxY; ++y) { for (int y = minY; y <= maxY; ++y) {
for (int x = minX; x <= maxX; ++x) { for (int x = minX; x <= maxX; ++x) {
@ -409,7 +404,7 @@ Uint32 Direct3DRMSoftwareRenderer::GetTextureId(IDirect3DRMTexture* iTexture)
if (texRef.version != texture->m_version) { if (texRef.version != texture->m_version) {
// Update animated textures // Update animated textures
SDL_DestroySurface(texRef.cached); SDL_DestroySurface(texRef.cached);
texRef.cached = SDL_ConvertSurface(surface->m_surface, m_backbuffer->format); texRef.cached = SDL_ConvertSurface(surface->m_surface, DDBackBuffer->format);
SDL_LockSurface(texRef.cached); SDL_LockSurface(texRef.cached);
texRef.version = texture->m_version; texRef.version = texture->m_version;
} }
@ -417,7 +412,7 @@ Uint32 Direct3DRMSoftwareRenderer::GetTextureId(IDirect3DRMTexture* iTexture)
} }
} }
SDL_Surface* convertedRender = SDL_ConvertSurface(surface->m_surface, m_backbuffer->format); SDL_Surface* convertedRender = SDL_ConvertSurface(surface->m_surface, DDBackBuffer->format);
SDL_LockSurface(convertedRender); SDL_LockSurface(convertedRender);
// Reuse freed slot // Reuse freed slot
@ -468,17 +463,17 @@ const char* Direct3DRMSoftwareRenderer::GetName()
HRESULT Direct3DRMSoftwareRenderer::Render() HRESULT Direct3DRMSoftwareRenderer::Render()
{ {
if (!m_backbuffer || m_vertexBuffer.size() % 3 != 0 || !SDL_LockSurface(m_backbuffer)) { if (!DDBackBuffer || m_vertexBuffer.size() % 3 != 0 || !SDL_LockSurface(DDBackBuffer)) {
return DDERR_GENERIC; return DDERR_GENERIC;
} }
ClearZBuffer(); ClearZBuffer();
m_format = SDL_GetPixelFormatDetails(m_backbuffer->format); m_format = SDL_GetPixelFormatDetails(DDBackBuffer->format);
m_palette = SDL_GetSurfacePalette(m_backbuffer); m_palette = SDL_GetSurfacePalette(DDBackBuffer);
m_bytesPerPixel = m_format->bits_per_pixel / 8; m_bytesPerPixel = m_format->bits_per_pixel / 8;
for (size_t i = 0; i + 2 < m_vertexBuffer.size(); i += 3) { for (size_t i = 0; i + 2 < m_vertexBuffer.size(); i += 3) {
DrawTriangleClipped(m_vertexBuffer[i], m_vertexBuffer[i + 1], m_vertexBuffer[i + 2]); DrawTriangleClipped(m_vertexBuffer[i], m_vertexBuffer[i + 1], m_vertexBuffer[i + 2]);
} }
SDL_UnlockSurface(m_backbuffer); SDL_UnlockSurface(DDBackBuffer);
m_vertexBuffer.clear(); m_vertexBuffer.clear();

1
miniwin/src/d3drm/d3drmviewport.cpp
View File

@ -334,7 +334,6 @@ HRESULT Direct3DRMViewportImpl::CollectSceneData()
m_renderer->PushLights(lights.data(), lights.size()); m_renderer->PushLights(lights.data(), lights.size());
m_renderer->PushVertices(verts.data(), verts.size()); m_renderer->PushVertices(verts.data(), verts.size());
m_renderer->SetBackbuffer(DDBackBuffer);
return D3DRM_OK; return D3DRM_OK;
} }

1
miniwin/src/internal/d3drmrenderer.h
View File

@ -35,7 +35,6 @@ static_assert(sizeof(SceneLight) == 48);
class Direct3DRMRenderer : public IDirect3DDevice2 { class Direct3DRMRenderer : public IDirect3DDevice2 {
public: public:
virtual void SetBackbuffer(SDL_Surface* backbuffer) = 0;
virtual void PushVertices(const PositionColorVertex* vertices, size_t count) = 0; virtual void PushVertices(const PositionColorVertex* vertices, size_t count) = 0;
virtual void PushLights(const SceneLight* vertices, size_t count) = 0; virtual void PushLights(const SceneLight* vertices, size_t count) = 0;
virtual void SetProjection(D3DRMMATRIX4D perspective, D3DVALUE front, D3DVALUE back) = 0; virtual void SetProjection(D3DRMMATRIX4D perspective, D3DVALUE front, D3DVALUE back) = 0;

2
miniwin/src/internal/d3drmrenderer_opengl15.h
View File

@ -15,7 +15,6 @@ class OpenGL15Renderer : public Direct3DRMRenderer {
static Direct3DRMRenderer* Create(DWORD width, DWORD height); static Direct3DRMRenderer* Create(DWORD width, DWORD height);
OpenGL15Renderer(int width, int height, SDL_GLContext context, GLuint fbo, GLuint colorTex, GLuint depthRb); OpenGL15Renderer(int width, int height, SDL_GLContext context, GLuint fbo, GLuint colorTex, GLuint depthRb);
~OpenGL15Renderer() override; ~OpenGL15Renderer() override;
void SetBackbuffer(SDL_Surface* surface) override;
void PushVertices(const PositionColorVertex* verts, size_t count) override; void PushVertices(const PositionColorVertex* verts, size_t count) override;
void PushLights(const SceneLight* lightsArray, size_t count) override; void PushLights(const SceneLight* lightsArray, size_t count) override;
void SetProjection(D3DRMMATRIX4D perspective, D3DVALUE front, D3DVALUE back) override; void SetProjection(D3DRMMATRIX4D perspective, D3DVALUE front, D3DVALUE back) override;
@ -29,7 +28,6 @@ class OpenGL15Renderer : public Direct3DRMRenderer {
private: private:
SDL_GLContext m_context; SDL_GLContext m_context;
D3DRMMATRIX4D m_projection; D3DRMMATRIX4D m_projection;
SDL_Surface* m_backbuffer = nullptr;
SDL_Surface* m_renderedImage; SDL_Surface* m_renderedImage;
int m_width, m_height; int m_width, m_height;
std::vector<PositionColorVertex> m_vertices; std::vector<PositionColorVertex> m_vertices;

2
miniwin/src/internal/d3drmrenderer_sdl3gpu.h
View File

@ -20,7 +20,6 @@ class Direct3DRMSDL3GPURenderer : public Direct3DRMRenderer {
public: public:
static Direct3DRMRenderer* Create(DWORD width, DWORD height); static Direct3DRMRenderer* Create(DWORD width, DWORD height);
~Direct3DRMSDL3GPURenderer() override; ~Direct3DRMSDL3GPURenderer() override;
void SetBackbuffer(SDL_Surface* backbuffer) override;
void PushVertices(const PositionColorVertex* vertices, size_t count) override; void PushVertices(const PositionColorVertex* vertices, size_t count) override;
void PushLights(const SceneLight* vertices, size_t count) override; void PushLights(const SceneLight* vertices, size_t count) override;
Uint32 GetTextureId(IDirect3DRMTexture* texture) override; Uint32 GetTextureId(IDirect3DRMTexture* texture) override;
@ -52,7 +51,6 @@ class Direct3DRMSDL3GPURenderer : public Direct3DRMRenderer {
ViewportUniforms m_uniforms; ViewportUniforms m_uniforms;
SceneLights m_lights; SceneLights m_lights;
D3DDEVICEDESC m_desc; D3DDEVICEDESC m_desc;
SDL_Surface* m_backbuffer = nullptr;
SDL_GPUDevice* m_device; SDL_GPUDevice* m_device;
SDL_GPUGraphicsPipeline* m_pipeline; SDL_GPUGraphicsPipeline* m_pipeline;
SDL_GPUTexture* m_transferTexture; SDL_GPUTexture* m_transferTexture;

2
miniwin/src/internal/d3drmrenderer_software.h
View File

@ -19,7 +19,6 @@ struct TextureCache {
class Direct3DRMSoftwareRenderer : public Direct3DRMRenderer { class Direct3DRMSoftwareRenderer : public Direct3DRMRenderer {
public: public:
Direct3DRMSoftwareRenderer(DWORD width, DWORD height); Direct3DRMSoftwareRenderer(DWORD width, DWORD height);
void SetBackbuffer(SDL_Surface* backbuffer) override;
void PushVertices(const PositionColorVertex* vertices, size_t count) override; void PushVertices(const PositionColorVertex* vertices, size_t count) override;
void PushLights(const SceneLight* vertices, size_t count) override; void PushLights(const SceneLight* vertices, size_t count) override;
Uint32 GetTextureId(IDirect3DRMTexture* texture) override; Uint32 GetTextureId(IDirect3DRMTexture* texture) override;
@ -45,7 +44,6 @@ class Direct3DRMSoftwareRenderer : public Direct3DRMRenderer {
DWORD m_width; DWORD m_width;
DWORD m_height; DWORD m_height;
SDL_Surface* m_backbuffer = nullptr;
SDL_Palette* m_palette; SDL_Palette* m_palette;
const SDL_PixelFormatDetails* m_format; const SDL_PixelFormatDetails* m_format;
int m_bytesPerPixel; int m_bytesPerPixel;