izzy/ppsspp
0
0
Fork 0
mirror of https://github.com/izzy2lost/ppsspp.git synced 2026-03-10 12:43:04 -07:00
Code Issues Packages Projects Releases Wiki Activity
Files
more-opts
ppsspp/Common/GPU/OpenGL/DataFormatGL.cpp

165 lines
3.5 KiB
C++
Raw Permalink Normal View History

Move most GPU things to Common. It works after the move, on Windows and Android at least. Deletes the D3DX9 shader compiler loader, which was not used.
2020-10-04 23:24:14 +02:00
#include "Common/GPU/OpenGL/DataFormatGL.h"
GLES: Use GL_LUMINANCE on GLES for indexed tex. See #16176, used for rendered CLUTs.
2022-10-08 16:06:39 -07:00
#include "Common/GPU/OpenGL/GLFeatures.h"
GL render manager: Simple implementation of synchronous framebuffer readbacks.
2017-12-19 14:35:24 +01:00
#include "Common/Log.h"
namespace Draw {
// TODO: Also output storage format (GL_RGBA8 etc) for modern GL usage.
Enable depth uploads on render-to-clut-buffer. Esoteric but needed for #11100. Compat flag for now.
2022-09-12 15:34:32 +02:00
bool Thin3DFormatToGLFormatAndType(DataFormat fmt, GLuint &internalFormat, GLuint &format, GLuint &type, int &alignment) {
GL render manager: Simple implementation of synchronous framebuffer readbacks.
2017-12-19 14:35:24 +01:00
alignment = 4;
switch (fmt) {
Enable depth uploads on render-to-clut-buffer. Esoteric but needed for #11100. Compat flag for now.
2022-09-12 15:34:32 +02:00
case DataFormat::R16_UNORM:
OpenGL fix
2022-09-12 23:32:38 +02:00
internalFormat = GL_RGBA;
format = GL_RED;
Enable depth uploads on render-to-clut-buffer. Esoteric but needed for #11100. Compat flag for now.
2022-09-12 15:34:32 +02:00
type = GL_UNSIGNED_SHORT;
OpenGL and D3D11 fixes
2022-09-14 23:35:15 +02:00
alignment = 2;
break;
case DataFormat::R8_UNORM:
GLES: Use GL_LUMINANCE on GLES for indexed tex. See #16176, used for rendered CLUTs.
2022-10-08 16:06:39 -07:00
if (gl_extensions.IsGLES) {
internalFormat = GL_LUMINANCE;
format = GL_LUMINANCE;
} else if (gl_extensions.VersionGEThan(3, 0)) {
internalFormat = GL_RED;
format = GL_RED;
} else {
internalFormat = GL_RGBA;
format = GL_RED;
}
OpenGL and D3D11 fixes
2022-09-14 23:35:15 +02:00
type = GL_UNSIGNED_BYTE;
alignment = 1;
Enable depth uploads on render-to-clut-buffer. Esoteric but needed for #11100. Compat flag for now.
2022-09-12 15:34:32 +02:00
break;
GL render manager: Simple implementation of synchronous framebuffer readbacks.
2017-12-19 14:35:24 +01:00
case DataFormat::R8G8B8A8_UNORM:
internalFormat = GL_RGBA;
format = GL_RGBA;
type = GL_UNSIGNED_BYTE;
break;
case DataFormat::D32F:
internalFormat = GL_DEPTH_COMPONENT;
format = GL_DEPTH_COMPONENT;
type = GL_FLOAT;
break;
#ifndef USING_GLES2
case DataFormat::S8:
internalFormat = GL_STENCIL_INDEX;
format = GL_STENCIL_INDEX;
type = GL_UNSIGNED_BYTE;
alignment = 1;
break;
#endif
case DataFormat::R8G8B8_UNORM:
internalFormat = GL_RGB;
format = GL_RGB;
type = GL_UNSIGNED_BYTE;
align should be 3 when format is GL_RGB and type is GL_UNSIGNED_BYTE
2023-06-24 16:09:28 +08:00
alignment = 3;
GL render manager: Simple implementation of synchronous framebuffer readbacks.
2017-12-19 14:35:24 +01:00
break;
Correct the wrong GL DataFormat enums
2019-10-24 23:01:45 +02:00
case DataFormat::R4G4B4A4_UNORM_PACK16:
GL render manager: Simple implementation of synchronous framebuffer readbacks.
2017-12-19 14:35:24 +01:00
internalFormat = GL_RGBA;
format = GL_RGBA;
type = GL_UNSIGNED_SHORT_4_4_4_4;
alignment = 2;
break;
Correct the wrong GL DataFormat enums
2019-10-24 23:01:45 +02:00
case DataFormat::R5G6B5_UNORM_PACK16:
GL render manager: Simple implementation of synchronous framebuffer readbacks.
2017-12-19 14:35:24 +01:00
internalFormat = GL_RGB;
format = GL_RGB;
type = GL_UNSIGNED_SHORT_5_6_5;
alignment = 2;
break;
Correct the wrong GL DataFormat enums
2019-10-24 23:01:45 +02:00
case DataFormat::R5G5B5A1_UNORM_PACK16:
GL render manager: Simple implementation of synchronous framebuffer readbacks.
2017-12-19 14:35:24 +01:00
internalFormat = GL_RGBA;
format = GL_RGBA;
type = GL_UNSIGNED_SHORT_5_5_5_1;
alignment = 2;
break;
OpenGL dataformat cleanup - pass Draw::DataFormat to the GLRenderManager. Avoids triple GLenum all over the place, and also clearly shows that the mapping is wrong.
2019-10-24 22:40:26 +02:00
case DataFormat::R32G32B32A32_FLOAT:
internalFormat = GL_RGBA32F;
format = GL_RGBA;
type = GL_FLOAT;
alignment = 16;
break;
OpenGL: Try a different way to exclude desktop compression formats in build May fix #17110
2023-03-14 16:09:40 +01:00
#ifndef USING_GLES2
Structs and enums and build files
2023-02-26 19:51:59 +01:00
case DataFormat::BC1_RGBA_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
format = GL_RGB;
type = GL_FLOAT;
alignment = 8;
break;
Couple of more GL enums
2023-03-11 21:51:39 +01:00
case DataFormat::BC2_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
format = GL_RGBA;
type = GL_FLOAT;
alignment = 16;
break;
case DataFormat::BC3_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
format = GL_RGBA;
type = GL_FLOAT;
alignment = 16;
break;
Finish up OpenGL compressed texture format checks. Show in dev screen
2023-03-12 12:18:55 +01:00
case DataFormat::BC4_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RED_RGTC1;
format = GL_R;
type = GL_FLOAT;
alignment = 16;
break;
case DataFormat::BC5_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RG_RGTC2;
format = GL_RG;
type = GL_FLOAT;
alignment = 16;
break;
Structs and enums and build files
2023-02-26 19:51:59 +01:00
case DataFormat::BC7_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_BPTC_UNORM;
format = GL_RGBA;
type = GL_FLOAT;
alignment = 16;
break;
#endif
case DataFormat::ETC2_R8G8B8_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGB8_ETC2;
format = GL_RGB;
type = GL_FLOAT;
alignment = 8;
break;
case DataFormat::ETC2_R8G8B8A1_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2;
format = GL_RGBA;
type = GL_FLOAT;
alignment = 16;
break;
case DataFormat::ETC2_R8G8B8A8_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA8_ETC2_EAC;
format = GL_RGBA;
type = GL_FLOAT;
alignment = 16;
break;
Fix building on OpenGL ES 2.0 (RPI VideoCore IV) GL_COMPRESSED_RGBA_ASTC_4x4_KHR is not defined and looks to be an OpenGL ES 3.0 extension. This fixes building on the Raspberry Pi 1-3 using VideoCore IV OpenGL ES 2.0 headers.
2023-11-21 20:16:09 +00:00
#ifdef GL_COMPRESSED_RGBA_ASTC_4x4_KHR
Structs and enums and build files
2023-02-26 19:51:59 +01:00
case DataFormat::ASTC_4x4_UNORM_BLOCK:
internalFormat = GL_COMPRESSED_RGBA_ASTC_4x4_KHR;
format = GL_RGBA;
type = GL_FLOAT;
alignment = 16;
break;
Fix building on OpenGL ES 2.0 (RPI VideoCore IV) GL_COMPRESSED_RGBA_ASTC_4x4_KHR is not defined and looks to be an OpenGL ES 3.0 extension. This fixes building on the Raspberry Pi 1-3 using VideoCore IV OpenGL ES 2.0 headers.
2023-11-21 20:16:09 +00:00
#endif
Structs and enums and build files
2023-02-26 19:51:59 +01:00
GL render manager: Simple implementation of synchronous framebuffer readbacks.
2017-12-19 14:35:24 +01:00
default:
return false;
}
return true;
}
Enough JNI/threading hackery to get it to run on Android! Broken readbacks make it crash alot though.
2018-01-28 17:27:23 +01:00
}
Reference in New Issue Copy Permalink