Patoke/4JLibs
1
0 Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix mistakes with texture renderer

Browse Source
This commit is contained in:
3UR committed 2026-03-02 12:15:26 +10:00
1 parent 48ce2cc065
commit d11b2f396a
1 file changed
+9 -7
Download Patch File Download Diff File Expand all files Collapse all files
Windows_Libs/Dev/Render/RendererTexture.cpp
+9 -7
View File
@@ -5,7 +5,7 @@ unsigned char* dataStart;
unsigned char* dataCurr; unsigned char* dataCurr;
unsigned char* dataEnd; unsigned char* dataEnd;
DXGI_FORMAT Renderer::textureFormats[] = { DXGI_FORMAT_R8G8B8A8_UNORM }; DXGI_FORMAT Renderer::textureFormats[] = { DXGI_FORMAT_B8G8R8A8_UNORM };
void user_write_data_init(unsigned char* pBuffer, int size) void user_write_data_init(unsigned char* pBuffer, int size)
{ {
@@ -220,8 +220,9 @@ HRESULT Renderer::LoadTextureData(const char* szFilename, D3DXIMAGE_INFO* pSrcIn
png_image_begin_read_from_file(&image, szFilename); png_image_begin_read_from_file(&image, szFilename);
if ((image.format & 3u) > 1) // TODO(3UR): why crash?
return -1; //if ((image.format & 3u) > 1)
// return -1;
image.format = PNG_FORMAT_RGBA; image.format = PNG_FORMAT_RGBA;
@@ -242,8 +243,9 @@ HRESULT Renderer::LoadTextureData(BYTE* pbData, DWORD dwBytes, D3DXIMAGE_INFO* p
png_image_begin_read_from_memory(&image, pbData, dwBytes); png_image_begin_read_from_memory(&image, pbData, dwBytes);
if ((image.format & 3u) > 1) // TODO(3UR): why crash?
return -1; //if ((image.format & 3u) > 1)
// return -1;
image.format = PNG_FORMAT_RGBA; image.format = PNG_FORMAT_RGBA;
@@ -263,7 +265,7 @@ HRESULT Renderer::SaveTextureData(const char* szFilename, D3DXIMAGE_INFO* pSrcIn
image.width = pSrcInfo->Width; image.width = pSrcInfo->Width;
image.height = pSrcInfo->Height; image.height = pSrcInfo->Height;
image.version = PNG_IMAGE_VERSION; image.version = PNG_IMAGE_VERSION;
image.format = PNG_FORMAT_RGB; image.format = PNG_FORMAT_RGBA;
png_image_write_to_file(&image, szFilename, 0, ppDataOut, 0, NULL); png_image_write_to_file(&image, szFilename, 0, ppDataOut, 0, NULL);
return S_OK; return S_OK;
@@ -276,7 +278,7 @@ HRESULT Renderer::SaveTextureDataToMemory(void* pOutput, int outputCapacity, int
image.width = width; image.width = width;
image.height = height; image.height = height;
image.version = PNG_IMAGE_VERSION; image.version = PNG_IMAGE_VERSION;
image.format = PNG_FORMAT_RGB; image.format = PNG_FORMAT_RGBA;
dataEnd = (BYTE*)pOutput + outputCapacity; dataEnd = (BYTE*)pOutput + outputCapacity;
dataStart = (BYTE*)pOutput; dataStart = (BYTE*)pOutput;