diff --git a/GPU/GLES/DepalettizeShaderGLES.cpp b/GPU/GLES/DepalettizeShaderGLES.cpp index c973909c79..821371a794 100644 --- a/GPU/GLES/DepalettizeShaderGLES.cpp +++ b/GPU/GLES/DepalettizeShaderGLES.cpp @@ -92,17 +92,15 @@ GLRTexture *DepalShaderCacheGLES::GetClutTexture(GEPaletteFormat clutFormat, con return oldtex->second->texture; } - GLuint dstFmt = getClutDestFormat(clutFormat); + Draw::DataFormat dstFmt = getClutDestFormat(clutFormat); int texturePixels = clutFormat == GE_CMODE_32BIT_ABGR8888 ? 256 : 512; DepalTexture *tex = new DepalTexture(); tex->texture = render_->CreateTexture(GL_TEXTURE_2D); - GLuint components = dstFmt == GL_UNSIGNED_SHORT_5_6_5 ? GL_RGB : GL_RGBA; - GLuint components2 = components; uint8_t *clutCopy = new uint8_t[1024]; memcpy(clutCopy, rawClut, 1024); - render_->TextureImage(tex->texture, 0, texturePixels, 1, components, components2, dstFmt, clutCopy, GLRAllocType::NEW, false); + render_->TextureImage(tex->texture, 0, texturePixels, 1, dstFmt, clutCopy, GLRAllocType::NEW, false); tex->lastFrame = gpuStats.numFlips; texCache_[clutId] = tex; diff --git a/GPU/GLES/DrawEngineGLES.cpp b/GPU/GLES/DrawEngineGLES.cpp index b24be91098..a934a25790 100644 --- a/GPU/GLES/DrawEngineGLES.cpp +++ b/GPU/GLES/DrawEngineGLES.cpp @@ -669,40 +669,40 @@ void TessellationDataTransferGLES::SendDataToShader(const SimpleVertex *const *p prevSizeV = size_v; if (!data_tex[0]) data_tex[0] = renderManager_->CreateTexture(GL_TEXTURE_2D); - renderManager_->TextureImage(data_tex[0], 0, size_u * 3, size_v, GL_RGBA32F, GL_RGBA, GL_FLOAT, nullptr, GLRAllocType::NONE, false); + renderManager_->TextureImage(data_tex[0], 0, size_u * 3, size_v, Draw::DataFormat::R32G32B32A32_FLOAT, nullptr, GLRAllocType::NONE, false); renderManager_->FinalizeTexture(data_tex[0], 0, false); } renderManager_->BindTexture(TEX_SLOT_SPLINE_POINTS, data_tex[0]); // Position - renderManager_->TextureSubImage(data_tex[0], 0, 0, 0, size_u, size_v, GL_RGBA, GL_FLOAT, (u8 *)pos, GLRAllocType::NEW); + renderManager_->TextureSubImage(data_tex[0], 0, 0, 0, size_u, size_v, Draw::DataFormat::R32G32B32A32_FLOAT, (u8 *)pos, GLRAllocType::NEW); // Texcoord if (hasTexCoord) - renderManager_->TextureSubImage(data_tex[0], 0, size_u, 0, size_u, size_v, GL_RGBA, GL_FLOAT, (u8 *)tex, GLRAllocType::NEW); + renderManager_->TextureSubImage(data_tex[0], 0, size_u, 0, size_u, size_v, Draw::DataFormat::R32G32B32A32_FLOAT, (u8 *)tex, GLRAllocType::NEW); // Color if (hasColor) - renderManager_->TextureSubImage(data_tex[0], 0, size_u * 2, 0, size_u, size_v, GL_RGBA, GL_FLOAT, (u8 *)col, GLRAllocType::NEW); + renderManager_->TextureSubImage(data_tex[0], 0, size_u * 2, 0, size_u, size_v, Draw::DataFormat::R32G32B32A32_FLOAT, (u8 *)col, GLRAllocType::NEW); // Weight U if (prevSizeWU < weights.size_u) { prevSizeWU = weights.size_u; if (!data_tex[1]) data_tex[1] = renderManager_->CreateTexture(GL_TEXTURE_2D); - renderManager_->TextureImage(data_tex[1], 0, weights.size_u * 2, 1, GL_RGBA32F, GL_RGBA, GL_FLOAT, nullptr, GLRAllocType::NONE, false); + renderManager_->TextureImage(data_tex[1], 0, weights.size_u * 2, 1, Draw::DataFormat::R32G32B32A32_FLOAT, nullptr, GLRAllocType::NONE, false); renderManager_->FinalizeTexture(data_tex[1], 0, false); } renderManager_->BindTexture(TEX_SLOT_SPLINE_WEIGHTS_U, data_tex[1]); - renderManager_->TextureSubImage(data_tex[1], 0, 0, 0, weights.size_u * 2, 1, GL_RGBA, GL_FLOAT, (u8 *)weights.u, GLRAllocType::NONE); + renderManager_->TextureSubImage(data_tex[1], 0, 0, 0, weights.size_u * 2, 1, Draw::DataFormat::R32G32B32A32_FLOAT, (u8 *)weights.u, GLRAllocType::NONE); // Weight V if (prevSizeWV < weights.size_v) { prevSizeWV = weights.size_v; if (!data_tex[2]) data_tex[2] = renderManager_->CreateTexture(GL_TEXTURE_2D); - renderManager_->TextureImage(data_tex[2], 0, weights.size_v * 2, 1, GL_RGBA32F, GL_RGBA, GL_FLOAT, nullptr, GLRAllocType::NONE, false); + renderManager_->TextureImage(data_tex[2], 0, weights.size_v * 2, 1, Draw::DataFormat::R32G32B32A32_FLOAT, nullptr, GLRAllocType::NONE, false); renderManager_->FinalizeTexture(data_tex[2], 0, false); } renderManager_->BindTexture(TEX_SLOT_SPLINE_WEIGHTS_V, data_tex[2]); - renderManager_->TextureSubImage(data_tex[2], 0, 0, 0, weights.size_v * 2, 1, GL_RGBA, GL_FLOAT, (u8 *)weights.v, GLRAllocType::NONE); + renderManager_->TextureSubImage(data_tex[2], 0, 0, 0, weights.size_v * 2, 1, Draw::DataFormat::R32G32B32A32_FLOAT, (u8 *)weights.v, GLRAllocType::NONE); } void TessellationDataTransferGLES::EndFrame() { diff --git a/GPU/GLES/FragmentTestCacheGLES.cpp b/GPU/GLES/FragmentTestCacheGLES.cpp index e870426ffd..a9459cd49a 100644 --- a/GPU/GLES/FragmentTestCacheGLES.cpp +++ b/GPU/GLES/FragmentTestCacheGLES.cpp @@ -145,7 +145,7 @@ GLRTexture *FragmentTestCacheGLES::CreateTestTexture(const GEComparison funcs[4] } GLRTexture *tex = render_->CreateTexture(GL_TEXTURE_2D); - render_->TextureImage(tex, 0, 256, 1, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, data); + render_->TextureImage(tex, 0, 256, 1, Draw::DataFormat::R8G8B8A8_UNORM, data); return tex; } diff --git a/GPU/GLES/FramebufferManagerGLES.cpp b/GPU/GLES/FramebufferManagerGLES.cpp index b2d814bb05..cd9bb696f2 100644 --- a/GPU/GLES/FramebufferManagerGLES.cpp +++ b/GPU/GLES/FramebufferManagerGLES.cpp @@ -379,7 +379,7 @@ void FramebufferManagerGLES::MakePixelTexture(const u8 *srcPixels, GEBufferForma break; } } - render_->TextureImage(drawPixelsTex_, 0, width, height, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, convBuf, GLRAllocType::NEW, false); + render_->TextureImage(drawPixelsTex_, 0, width, height, Draw::DataFormat::R8G8B8A8_UNORM, convBuf, GLRAllocType::NEW, false); render_->FinalizeTexture(drawPixelsTex_, 0, false); // TODO: Return instead? diff --git a/GPU/GLES/TextureCacheGLES.cpp b/GPU/GLES/TextureCacheGLES.cpp index 9bfc2a6cfa..410f50ea05 100644 --- a/GPU/GLES/TextureCacheGLES.cpp +++ b/GPU/GLES/TextureCacheGLES.cpp @@ -86,18 +86,18 @@ void TextureCacheGLES::Clear(bool delete_them) { TextureCacheCommon::Clear(delete_them); } -GLenum getClutDestFormat(GEPaletteFormat format) { +Draw::DataFormat getClutDestFormat(GEPaletteFormat format) { switch (format) { case GE_CMODE_16BIT_ABGR4444: - return GL_UNSIGNED_SHORT_4_4_4_4; + return Draw::DataFormat::B4G4R4A4_UNORM_PACK16; case GE_CMODE_16BIT_ABGR5551: - return GL_UNSIGNED_SHORT_5_5_5_1; + return Draw::DataFormat::B5G5R5A1_UNORM_PACK16; case GE_CMODE_16BIT_BGR5650: - return GL_UNSIGNED_SHORT_5_6_5; + return Draw::DataFormat::B5G6R5_UNORM_PACK16; case GE_CMODE_32BIT_ABGR8888: - return GL_UNSIGNED_BYTE; + return Draw::DataFormat::R8G8B8A8_UNORM; } - return 0; + return Draw::DataFormat::UNDEFINED;; } static const GLuint MinFiltGL[8] = { @@ -188,18 +188,18 @@ void TextureCacheGLES::SetFramebufferSamplingParams(u16 bufferWidth, u16 bufferH render_->SetTextureSampler(TEX_SLOT_PSP_TEXTURE, sClamp ? GL_CLAMP_TO_EDGE : GL_REPEAT, tClamp ? GL_CLAMP_TO_EDGE : GL_REPEAT, MagFiltGL[magFilt], MinFiltGL[minFilt], aniso); } -static void ConvertColors(void *dstBuf, const void *srcBuf, GLuint dstFmt, int numPixels) { +static void ConvertColors(void *dstBuf, const void *srcBuf, Draw::DataFormat dstFmt, int numPixels) { const u32 *src = (const u32 *)srcBuf; u32 *dst = (u32 *)dstBuf; switch (dstFmt) { - case GL_UNSIGNED_SHORT_4_4_4_4: + case Draw::DataFormat::B4G4R4A4_UNORM_PACK16: ConvertRGBA4444ToABGR4444((u16 *)dst, (const u16 *)src, numPixels); break; // Final Fantasy 2 uses this heavily in animated textures. - case GL_UNSIGNED_SHORT_5_5_5_1: + case Draw::DataFormat::B5G5R5A1_UNORM_PACK16: ConvertRGBA5551ToABGR1555((u16 *)dst, (const u16 *)src, numPixels); break; - case GL_UNSIGNED_SHORT_5_6_5: + case Draw::DataFormat::B5G6R5_UNORM_PACK16: ConvertRGB565ToBGR565((u16 *)dst, (const u16 *)src, numPixels); break; default: @@ -514,22 +514,22 @@ void TextureCacheGLES::ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFram gstate_c.Dirty(DIRTY_BLEND_STATE | DIRTY_DEPTHSTENCIL_STATE | DIRTY_RASTER_STATE | DIRTY_VIEWPORTSCISSOR_STATE); } -ReplacedTextureFormat FromGLESFormat(GLenum fmt) { +ReplacedTextureFormat FromDataFormat(Draw::DataFormat fmt) { // TODO: 16-bit formats are incorrect, since swizzled. switch (fmt) { - case GL_UNSIGNED_SHORT_5_6_5: return ReplacedTextureFormat::F_0565_ABGR; - case GL_UNSIGNED_SHORT_5_5_5_1: return ReplacedTextureFormat::F_1555_ABGR; - case GL_UNSIGNED_SHORT_4_4_4_4: return ReplacedTextureFormat::F_4444_ABGR; - case GL_UNSIGNED_BYTE: default: return ReplacedTextureFormat::F_8888; + case Draw::DataFormat::B5G6R5_UNORM_PACK16: return ReplacedTextureFormat::F_0565_ABGR; + case Draw::DataFormat::B5G5R5A1_UNORM_PACK16: return ReplacedTextureFormat::F_1555_ABGR; + case Draw::DataFormat::B4G4R4A4_UNORM_PACK16: return ReplacedTextureFormat::F_4444_ABGR; + case Draw::DataFormat::R8G8B8A8_UNORM: default: return ReplacedTextureFormat::F_8888; } } -GLenum ToGLESFormat(ReplacedTextureFormat fmt) { +Draw::DataFormat ToDataFormat(ReplacedTextureFormat fmt) { switch (fmt) { - case ReplacedTextureFormat::F_5650: return GL_UNSIGNED_SHORT_5_6_5; - case ReplacedTextureFormat::F_5551: return GL_UNSIGNED_SHORT_5_5_5_1; - case ReplacedTextureFormat::F_4444: return GL_UNSIGNED_SHORT_4_4_4_4; - case ReplacedTextureFormat::F_8888: default: return GL_UNSIGNED_BYTE; + case ReplacedTextureFormat::F_5650: return Draw::DataFormat::B5G6R5_UNORM_PACK16; + case ReplacedTextureFormat::F_5551: return Draw::DataFormat::B5G5R5A1_UNORM_PACK16; + case ReplacedTextureFormat::F_4444: return Draw::DataFormat::B4G4R4A4_UNORM_PACK16; + case ReplacedTextureFormat::F_8888: default: return Draw::DataFormat::R8G8B8A8_UNORM; } } @@ -592,7 +592,7 @@ void TextureCacheGLES::BuildTexture(TexCacheEntry *const entry) { } // If GLES3 is available, we can preallocate the storage, which makes texture loading more efficient. - GLenum dstFmt = GetDestFormat(GETextureFormat(entry->format), gstate.getClutPaletteFormat()); + Draw::DataFormat dstFmt = GetDestFormat(GETextureFormat(entry->format), gstate.getClutPaletteFormat()); int scaleFactor = standardScaleFactor_; @@ -700,7 +700,7 @@ void TextureCacheGLES::BuildTexture(TexCacheEntry *const entry) { UpdateSamplingParams(*entry, true); } -GLenum TextureCacheGLES::GetDestFormat(GETextureFormat format, GEPaletteFormat clutFormat) const { +Draw::DataFormat TextureCacheGLES::GetDestFormat(GETextureFormat format, GEPaletteFormat clutFormat) const { switch (format) { case GE_TFMT_CLUT4: case GE_TFMT_CLUT8: @@ -708,30 +708,30 @@ GLenum TextureCacheGLES::GetDestFormat(GETextureFormat format, GEPaletteFormat c case GE_TFMT_CLUT32: return getClutDestFormat(clutFormat); case GE_TFMT_4444: - return GL_UNSIGNED_SHORT_4_4_4_4; + return Draw::DataFormat::B4G4R4A4_UNORM_PACK16; case GE_TFMT_5551: - return GL_UNSIGNED_SHORT_5_5_5_1; + return Draw::DataFormat::B5G5R5A1_UNORM_PACK16; case GE_TFMT_5650: - return GL_UNSIGNED_SHORT_5_6_5; + return Draw::DataFormat::B5G6R5_UNORM_PACK16; case GE_TFMT_8888: case GE_TFMT_DXT1: case GE_TFMT_DXT3: case GE_TFMT_DXT5: default: - return GL_UNSIGNED_BYTE; + return Draw::DataFormat::R8G8B8A8_UNORM; } } -TexCacheEntry::TexStatus TextureCacheGLES::CheckAlpha(const uint8_t *pixelData, GLenum dstFmt, int stride, int w, int h) { +TexCacheEntry::TexStatus TextureCacheGLES::CheckAlpha(const uint8_t *pixelData, Draw::DataFormat dstFmt, int stride, int w, int h) { CheckAlphaResult res; switch (dstFmt) { - case GL_UNSIGNED_SHORT_4_4_4_4: + case Draw::DataFormat::B4G4R4A4_UNORM_PACK16: res = CheckAlphaABGR4444Basic((const uint32_t *)pixelData, stride, w, h); break; - case GL_UNSIGNED_SHORT_5_5_5_1: + case Draw::DataFormat::B5G5R5A1_UNORM_PACK16: res = CheckAlphaABGR1555Basic((const uint32_t *)pixelData, stride, w, h); break; - case GL_UNSIGNED_SHORT_5_6_5: + case Draw::DataFormat::B5G6R5_UNORM_PACK16: // Never has any alpha. res = CHECKALPHA_FULL; break; @@ -743,7 +743,7 @@ TexCacheEntry::TexStatus TextureCacheGLES::CheckAlpha(const uint8_t *pixelData, return (TexCacheEntry::TexStatus)res; } -void TextureCacheGLES::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int scaleFactor, GLenum dstFmt) { +void TextureCacheGLES::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int scaleFactor, Draw::DataFormat dstFmt) { int w = gstate.getTextureWidth(level); int h = gstate.getTextureHeight(level); uint8_t *pixelData; @@ -760,7 +760,7 @@ void TextureCacheGLES::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &r replaced.Load(level, rearrange, decPitch); pixelData = rearrange; - dstFmt = ToGLESFormat(replaced.Format(level)); + dstFmt = ToDataFormat(replaced.Format(level)); } else { PROFILE_THIS_SCOPE("decodetex"); @@ -768,7 +768,7 @@ void TextureCacheGLES::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &r u32 texaddr = gstate.getTextureAddress(level); int bufw = GetTextureBufw(level, texaddr, GETextureFormat(entry.format)); - int pixelSize = dstFmt == GL_UNSIGNED_BYTE ? 4 : 2; + int pixelSize = dstFmt == Draw::DataFormat::R8G8B8A8_UNORM ? 4 : 2; // We leave GL_UNPACK_ALIGNMENT at 4, so this must be at least 4. decPitch = std::max(w * pixelSize, 4); @@ -785,7 +785,9 @@ void TextureCacheGLES::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &r if (scaleFactor > 1) { uint8_t *rearrange = (uint8_t *)AllocateAlignedMemory(w * scaleFactor * h * scaleFactor * 4, 16); - scaler.ScaleAlways((u32 *)rearrange, (u32 *)pixelData, dstFmt, w, h, scaleFactor); + u32 dFmt = (u32)dstFmt; + scaler.ScaleAlways((u32 *)rearrange, (u32 *)pixelData, dFmt, w, h, scaleFactor); + dstFmt = (Draw::DataFormat)dFmt; FreeAlignedMemory(pixelData); pixelData = rearrange; decPitch = w * 4; @@ -799,21 +801,17 @@ void TextureCacheGLES::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &r replacedInfo.isVideo = videos_.find(entry.addr & 0x3FFFFFFF) != videos_.end(); replacedInfo.isFinal = (entry.status & TexCacheEntry::STATUS_TO_SCALE) == 0; replacedInfo.scaleFactor = scaleFactor; - replacedInfo.fmt = FromGLESFormat(dstFmt); + replacedInfo.fmt = FromDataFormat(dstFmt); replacer_.NotifyTextureDecoded(replacedInfo, pixelData, decPitch, level, w, h); } } - - GLuint components = dstFmt == GL_UNSIGNED_SHORT_5_6_5 ? GL_RGB : GL_RGBA; - - GLuint components2 = components; - + PROFILE_THIS_SCOPE("loadtex"); if (IsFakeMipmapChange()) - render_->TextureImage(entry.textureName, 0, w, h, components, components2, dstFmt, pixelData, GLRAllocType::ALIGNED); + render_->TextureImage(entry.textureName, 0, w, h, dstFmt, pixelData, GLRAllocType::ALIGNED); else - render_->TextureImage(entry.textureName, level, w, h, components, components2, dstFmt, pixelData, GLRAllocType::ALIGNED); + render_->TextureImage(entry.textureName, level, w, h, dstFmt, pixelData, GLRAllocType::ALIGNED); } bool TextureCacheGLES::GetCurrentTextureDebug(GPUDebugBuffer &buffer, int level) { diff --git a/GPU/GLES/TextureCacheGLES.h b/GPU/GLES/TextureCacheGLES.h index be60d7eb77..abb4d2d2fb 100644 --- a/GPU/GLES/TextureCacheGLES.h +++ b/GPU/GLES/TextureCacheGLES.h @@ -76,10 +76,10 @@ protected: private: void UpdateSamplingParams(TexCacheEntry &entry, bool force); - void LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int scaleFactor, GLenum dstFmt); - GLenum GetDestFormat(GETextureFormat format, GEPaletteFormat clutFormat) const; + void LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &replaced, int level, int scaleFactor, Draw::DataFormat dstFmt); + Draw::DataFormat GetDestFormat(GETextureFormat format, GEPaletteFormat clutFormat) const; - TexCacheEntry::TexStatus CheckAlpha(const uint8_t *pixelData, GLenum dstFmt, int stride, int w, int h); + TexCacheEntry::TexStatus CheckAlpha(const uint8_t *pixelData, Draw::DataFormat dstFmt, int stride, int w, int h); void UpdateCurrentClut(GEPaletteFormat clutFormat, u32 clutBase, bool clutIndexIsSimple) override; void ApplyTextureFramebuffer(TexCacheEntry *entry, VirtualFramebuffer *framebuffer) override; @@ -101,4 +101,4 @@ private: enum { INVALID_TEX = -1 }; }; -GLenum getClutDestFormat(GEPaletteFormat format); +Draw::DataFormat getClutDestFormat(GEPaletteFormat format); diff --git a/GPU/GLES/TextureScalerGLES.cpp b/GPU/GLES/TextureScalerGLES.cpp index d73c2ce944..4d2ae06366 100644 --- a/GPU/GLES/TextureScalerGLES.cpp +++ b/GPU/GLES/TextureScalerGLES.cpp @@ -28,30 +28,32 @@ #include "Common/ColorConv.h" #include "Common/Log.h" #include "Common/ThreadPools.h" +#include "thin3d/DataFormat.h" int TextureScalerGLES::BytesPerPixel(u32 format) { - return (format == GL_UNSIGNED_BYTE) ? 4 : 2; + return ((Draw::DataFormat)format == Draw::DataFormat::R8G8B8A8_UNORM) ? 4 : 2; } u32 TextureScalerGLES::Get8888Format() { - return GL_UNSIGNED_BYTE; + return (u32)Draw::DataFormat::R8G8B8A8_UNORM; } void TextureScalerGLES::ConvertTo8888(u32 format, u32* source, u32* &dest, int width, int height) { - switch(format) { - case GL_UNSIGNED_BYTE: + Draw::DataFormat fmt = (Draw::DataFormat)format; + switch (fmt) { + case Draw::DataFormat::R8G8B8A8_UNORM: dest = source; // already fine break; - case GL_UNSIGNED_SHORT_4_4_4_4: + case Draw::DataFormat::B4G4R4A4_UNORM_PACK16: GlobalThreadPool::Loop(std::bind(&convert4444_gl, (u16*)source, dest, width, std::placeholders::_1, std::placeholders::_2), 0, height); break; - case GL_UNSIGNED_SHORT_5_6_5: + case Draw::DataFormat::B5G6R5_UNORM_PACK16: GlobalThreadPool::Loop(std::bind(&convert565_gl, (u16*)source, dest, width, std::placeholders::_1, std::placeholders::_2), 0, height); break; - case GL_UNSIGNED_SHORT_5_5_5_1: + case Draw::DataFormat::B5G5R5A1_UNORM_PACK16: GlobalThreadPool::Loop(std::bind(&convert5551_gl, (u16*)source, dest, width, std::placeholders::_1, std::placeholders::_2), 0, height); break; diff --git a/ext/native/thin3d/DataFormatGL.cpp b/ext/native/thin3d/DataFormatGL.cpp index 5d48f15868..b9d6c5a9a3 100644 --- a/ext/native/thin3d/DataFormatGL.cpp +++ b/ext/native/thin3d/DataFormatGL.cpp @@ -57,6 +57,13 @@ bool Thin3DFormatToFormatAndType(DataFormat fmt, GLuint &internalFormat, GLuint alignment = 2; break; + case DataFormat::R32G32B32A32_FLOAT: + internalFormat = GL_RGBA32F; + format = GL_RGBA; + type = GL_FLOAT; + alignment = 16; + break; + #ifndef USING_GLES2 case DataFormat::A4R4G4B4_UNORM_PACK16: internalFormat = GL_RGBA; diff --git a/ext/native/thin3d/GLQueueRunner.cpp b/ext/native/thin3d/GLQueueRunner.cpp index 90540eb90a..e42101798b 100644 --- a/ext/native/thin3d/GLQueueRunner.cpp +++ b/ext/native/thin3d/GLQueueRunner.cpp @@ -9,6 +9,7 @@ #include "gfx/gl_common.h" #include "gfx/gl_debug_log.h" #include "gfx_es2/gpu_features.h" +#include "thin3d/DataFormatGL.h" #include "math/dataconv.h" #include "math/math_util.h" @@ -315,7 +316,11 @@ void GLQueueRunner::RunInitSteps(const std::vector &steps, bool ski if (!step.texture_image.data && step.texture_image.allocType != GLRAllocType::NONE) Crash(); // For things to show in RenderDoc, need to split into glTexImage2D(..., nullptr) and glTexSubImage. - glTexImage2D(tex->target, step.texture_image.level, step.texture_image.internalFormat, step.texture_image.width, step.texture_image.height, 0, step.texture_image.format, step.texture_image.type, step.texture_image.data); + + GLenum internalFormat, format, type; + int alignment; + Thin3DFormatToFormatAndType(step.texture_image.format, internalFormat, format, type, alignment); + glTexImage2D(tex->target, step.texture_image.level, internalFormat, step.texture_image.width, step.texture_image.height, 0, format, type, step.texture_image.data); allocatedTextures = true; if (step.texture_image.allocType == GLRAllocType::ALIGNED) { FreeAlignedMemory(step.texture_image.data); @@ -1110,7 +1115,10 @@ void GLQueueRunner::PerformRenderPass(const GLRStep &step) { if (!c.texture_subimage.data) Crash(); // For things to show in RenderDoc, need to split into glTexImage2D(..., nullptr) and glTexSubImage. - glTexSubImage2D(tex->target, c.texture_subimage.level, c.texture_subimage.x, c.texture_subimage.y, c.texture_subimage.width, c.texture_subimage.height, c.texture_subimage.format, c.texture_subimage.type, c.texture_subimage.data); + GLuint internalFormat, format, type; + int alignment; + Thin3DFormatToFormatAndType(c.texture_subimage.format, internalFormat, format, type, alignment); + glTexSubImage2D(tex->target, c.texture_subimage.level, c.texture_subimage.x, c.texture_subimage.y, c.texture_subimage.width, c.texture_subimage.height, format, type, c.texture_subimage.data); if (c.texture_subimage.allocType == GLRAllocType::ALIGNED) { FreeAlignedMemory(c.texture_subimage.data); } else if (c.texture_subimage.allocType == GLRAllocType::NEW) { diff --git a/ext/native/thin3d/GLQueueRunner.h b/ext/native/thin3d/GLQueueRunner.h index b7a1586d59..41bceedb20 100644 --- a/ext/native/thin3d/GLQueueRunner.h +++ b/ext/native/thin3d/GLQueueRunner.h @@ -142,8 +142,7 @@ struct GLRRenderData { } texture; struct { GLRTexture *texture; - GLenum format; - GLenum type; + Draw::DataFormat format; int level; int x; int y; @@ -254,9 +253,7 @@ struct GLRInitStep { } buffer_subdata; struct { GLRTexture *texture; - GLenum internalFormat; - GLenum format; - GLenum type; + Draw::DataFormat format; int level; int width; int height; diff --git a/ext/native/thin3d/GLRenderManager.h b/ext/native/thin3d/GLRenderManager.h index 7fa35e8231..d7d6f54b76 100644 --- a/ext/native/thin3d/GLRenderManager.h +++ b/ext/native/thin3d/GLRenderManager.h @@ -525,13 +525,11 @@ public: } // Takes ownership over the data pointer and delete[]-s it. - void TextureImage(GLRTexture *texture, int level, int width, int height, GLenum internalFormat, GLenum format, GLenum type, uint8_t *data, GLRAllocType allocType = GLRAllocType::NEW, bool linearFilter = false) { + void TextureImage(GLRTexture *texture, int level, int width, int height, Draw::DataFormat format, uint8_t *data, GLRAllocType allocType = GLRAllocType::NEW, bool linearFilter = false) { GLRInitStep step{ GLRInitStepType::TEXTURE_IMAGE }; step.texture_image.texture = texture; step.texture_image.data = data; - step.texture_image.internalFormat = internalFormat; step.texture_image.format = format; - step.texture_image.type = type; step.texture_image.level = level; step.texture_image.width = width; step.texture_image.height = height; @@ -540,13 +538,12 @@ public: initSteps_.push_back(step); } - void TextureSubImage(GLRTexture *texture, int level, int x, int y, int width, int height, GLenum format, GLenum type, uint8_t *data, GLRAllocType allocType = GLRAllocType::NEW) { + void TextureSubImage(GLRTexture *texture, int level, int x, int y, int width, int height, Draw::DataFormat format, uint8_t *data, GLRAllocType allocType = GLRAllocType::NEW) { _dbg_assert_(G3D, curRenderStep_ && curRenderStep_->stepType == GLRStepType::RENDER); GLRRenderData _data{ GLRRenderCommand::TEXTURE_SUBIMAGE }; _data.texture_subimage.texture = texture; _data.texture_subimage.data = data; _data.texture_subimage.format = format; - _data.texture_subimage.type = type; _data.texture_subimage.level = level; _data.texture_subimage.x = x; _data.texture_subimage.y = y; diff --git a/ext/native/thin3d/thin3d_gl.cpp b/ext/native/thin3d/thin3d_gl.cpp index c570611fcd..d7387f9c95 100644 --- a/ext/native/thin3d/thin3d_gl.cpp +++ b/ext/native/thin3d/thin3d_gl.cpp @@ -726,23 +726,17 @@ void OpenGLTexture::SetImageData(int x, int y, int z, int width, int height, int depth_ = depth; } - GLuint internalFormat; - GLuint format; - GLuint type; - int alignment; - if (!Thin3DFormatToFormatAndType(format_, internalFormat, format, type, alignment)) { - return; - } - if (stride == 0) stride = width; + + size_t alignment = DataFormatSizeInBytes(format_); // Make a copy of data with stride eliminated. uint8_t *texData = new uint8_t[(size_t)(width * height * alignment)]; for (int y = 0; y < height; y++) { memcpy(texData + y * width * alignment, data + y * stride * alignment, width * alignment); } - render_->TextureImage(tex_, level, width, height, internalFormat, format, type, texData); + render_->TextureImage(tex_, level, width, height, format_, texData); } #ifdef DEBUG_READ_PIXELS