isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-03 12:31:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor c3d renderer (#14)

Browse Source 
* Refactor c3d renderer

* format

* Apply suggestions from code review

Co-authored-by: Anders Jenbo <anders@jenbo.dk>

---------

Co-authored-by: Anders Jenbo <anders@jenbo.dk>
This commit is contained in:
Joshua Peisach 2025-06-30 18:11:09 -04:00 committed by GitHub
parent eeb7c16425
commit 6b5fbdd27a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
miniwin/src/d3drm/backends/citro3d/renderer.cpp
View File

@ -1,3 +1,4 @@
#include "d3drmrenderer.h"
#include "d3drmrenderer_citro3d.h" #include "d3drmrenderer_citro3d.h"
#include "d3drmtexture_impl.h" #include "d3drmtexture_impl.h"
#include "ddraw_impl.h" #include "ddraw_impl.h"
@ -362,15 +363,6 @@ Uint32 Citro3DRenderer::GetMeshId(IDirect3DRMMesh* mesh, const MeshGroup* meshGr
return (Uint32) (m_meshs.size() - 1); return (Uint32) (m_meshs.size() - 1);
} }
void Citro3DRenderer::GetDesc(D3DDEVICEDESC* halDesc, D3DDEVICEDESC* helDesc)
{
}
const char* Citro3DRenderer::GetName()
{
return "Citro3D";
}
void Citro3DRenderer::StartFrame() void Citro3DRenderer::StartFrame()
{ {
if (g_rendering) { if (g_rendering) {

12
miniwin/src/internal/d3drmrenderer_citro3d.h
View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "d3drmrenderer.h" #include "d3drmrenderer.h"
#include "ddraw_impl.h"
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
#include <citro3d.h> #include <citro3d.h>
@ -33,8 +34,6 @@ class Citro3DRenderer : public Direct3DRMRenderer {
void SetFrustumPlanes(const Plane* frustumPlanes) override; void SetFrustumPlanes(const Plane* frustumPlanes) override;
Uint32 GetTextureId(IDirect3DRMTexture* texture, bool isUi) override; Uint32 GetTextureId(IDirect3DRMTexture* texture, bool isUi) override;
Uint32 GetMeshId(IDirect3DRMMesh* mesh, const MeshGroup* meshGroup) override; Uint32 GetMeshId(IDirect3DRMMesh* mesh, const MeshGroup* meshGroup) override;
void GetDesc(D3DDEVICEDESC* halDesc, D3DDEVICEDESC* helDesc) override;
const char* GetName() override;
HRESULT BeginFrame() override; HRESULT BeginFrame() override;
void EnableTransparency() override; void EnableTransparency() override;
void SubmitDraw( void SubmitDraw(
@ -68,9 +67,6 @@ class Citro3DRenderer : public Direct3DRMRenderer {
inline static void Citro3DRenderer_EnumDevice(LPD3DENUMDEVICESCALLBACK cb, void* ctx) inline static void Citro3DRenderer_EnumDevice(LPD3DENUMDEVICESCALLBACK cb, void* ctx)
{ {
GUID guid = Citro3D_GUID;
char* deviceNameDup = SDL_strdup("Citro3D");
char* deviceDescDup = SDL_strdup("Miniwin driver");
D3DDEVICEDESC halDesc = {}; D3DDEVICEDESC halDesc = {};
halDesc.dcmColorModel = D3DCOLOR_RGB; halDesc.dcmColorModel = D3DCOLOR_RGB;
halDesc.dwFlags = D3DDD_DEVICEZBUFFERBITDEPTH; halDesc.dwFlags = D3DDD_DEVICEZBUFFERBITDEPTH;
@ -79,10 +75,8 @@ inline static void Citro3DRenderer_EnumDevice(LPD3DENUMDEVICESCALLBACK cb, void*
halDesc.dpcTriCaps.dwTextureCaps = D3DPTEXTURECAPS_PERSPECTIVE; halDesc.dpcTriCaps.dwTextureCaps = D3DPTEXTURECAPS_PERSPECTIVE;
halDesc.dpcTriCaps.dwShadeCaps = D3DPSHADECAPS_ALPHAFLATBLEND; halDesc.dpcTriCaps.dwShadeCaps = D3DPSHADECAPS_ALPHAFLATBLEND;
halDesc.dpcTriCaps.dwTextureFilterCaps = D3DPTFILTERCAPS_LINEAR; halDesc.dpcTriCaps.dwTextureFilterCaps = D3DPTFILTERCAPS_LINEAR;
D3DDEVICEDESC helDesc = {}; D3DDEVICEDESC helDesc = {};
cb(&guid, deviceNameDup, deviceDescDup, &halDesc, &helDesc, ctx); EnumDevice(cb, ctx, "Citro3D", &halDesc, &helDesc, Citro3D_GUID);
SDL_free(deviceDescDup);
SDL_free(deviceNameDup);
} }