MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Use graphics backend in GLideNHQ

Browse Source
This commit is contained in:
Logan McNaughton 2018-03-26 14:00:25 -06:00 committed by Sergey Lipskiy
parent afc41907d5
commit 50998f2f33
10 changed files with 91 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GLideNHQ/CMakeLists.txt
View File

@ -27,12 +27,6 @@ else(MINGW OR PANDORA OR BCMHOST)
endif(MINGW OR PANDORA OR BCMHOST) endif(MINGW OR PANDORA OR BCMHOST)
LINK_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/lib ) LINK_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/lib )
if(GLES2)
add_definitions(
-DGLES2
)
endif(GLES2)
if(UNIX) if(UNIX)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_definitions( add_definitions(
@ -161,11 +155,11 @@ else( NOT GHQCHK )
) )
if( CMAKE_BUILD_TYPE STREQUAL "Debug") if( CMAKE_BUILD_TYPE STREQUAL "Debug")
target_link_libraries(ghqchk ${OPENGL_LIBRARIES} png z ) target_link_libraries(ghqchk png z )
endif( CMAKE_BUILD_TYPE STREQUAL "Debug") endif( CMAKE_BUILD_TYPE STREQUAL "Debug")
if( CMAKE_BUILD_TYPE STREQUAL "Release") if( CMAKE_BUILD_TYPE STREQUAL "Release")
target_link_libraries(ghqchk ${OPENGL_LIBRARIES} png z ) target_link_libraries(ghqchk png z )
endif( CMAKE_BUILD_TYPE STREQUAL "Release") endif( CMAKE_BUILD_TYPE STREQUAL "Release")
endif( NOT GHQCHK ) endif( NOT GHQCHK )

50
src/GLideNHQ/TxFilter.cpp
View File

@ -161,8 +161,8 @@ TxFilter::filter(uint8 *src, int srcwidth, int srcheight, uint16 srcformat, uint
{ {
uint8 *texture = src; uint8 *texture = src;
uint8 *tmptex = _tex1; uint8 *tmptex = _tex1;
if (srcformat == GL_RGBA) if (srcformat == u32(graphics::colorFormat::RGBA))
srcformat = GL_RGBA8; srcformat = u32(graphics::internalcolorFormat::RGBA8);
uint16 destformat = srcformat; uint16 destformat = srcformat;
/* We need to be initialized first! */ /* We need to be initialized first! */
@ -192,19 +192,18 @@ TxFilter::filter(uint8 *src, int srcwidth, int srcheight, uint16 srcformat, uint
*/ */
if ((srcwidth >= 4 && srcheight >= 4) && if ((srcwidth >= 4 && srcheight >= 4) &&
((_options & (FILTER_MASK|ENHANCEMENT_MASK)) || ((_options & (FILTER_MASK|ENHANCEMENT_MASK)) ||
(srcformat == GL_RGBA8 && (_maxbpp < 32 || _options & FORCE16BPP_TEX)))) { (srcformat == u32(graphics::internalcolorFormat::RGBA8) && (_maxbpp < 32 || _options & FORCE16BPP_TEX)))) {
if (srcformat != GL_RGBA8) { if (srcformat != u32(graphics::internalcolorFormat::RGBA8)) {
if (!_txQuantize->quantize(texture, tmptex, srcwidth, srcheight, srcformat, GL_RGBA8)) { if (!_txQuantize->quantize(texture, tmptex, srcwidth, srcheight, srcformat, u32(graphics::internalcolorFormat::RGBA8))) {
DBG_INFO(80, wst("Error: unsupported format! gfmt:%x\n"), srcformat); DBG_INFO(80, wst("Error: unsupported format! gfmt:%x\n"), srcformat);
return 0; return 0;
} }
texture = tmptex; texture = tmptex;
destformat = GL_RGBA8; destformat = u32(graphics::internalcolorFormat::RGBA8);
} }
switch (destformat) { if (destformat == u32(graphics::internalcolorFormat::RGBA8)) {
case GL_RGBA8:
/* /*
* prepare texture enhancements (x2, x4 scalers) * prepare texture enhancements (x2, x4 scalers)
@ -356,12 +355,12 @@ TxFilter::filter(uint8 *src, int srcwidth, int srcheight, uint16 srcformat, uint
/* /*
* texture (re)conversions * texture (re)conversions
*/ */
if (destformat == GL_RGBA8 && (_maxbpp < 32 || _options & FORCE16BPP_TEX)) { if (destformat == u32(graphics::internalcolorFormat::RGBA8) && (_maxbpp < 32 || _options & FORCE16BPP_TEX)) {
if (srcformat == GL_RGBA8) if (srcformat == u32(graphics::internalcolorFormat::RGBA8))
srcformat = GL_RGBA4; srcformat = u32(graphics::internalcolorFormat::RGBA4);
if (srcformat != GL_RGBA8) { if (srcformat != u32(graphics::internalcolorFormat::RGBA8)) {
tmptex = (texture == _tex1) ? _tex2 : _tex1; tmptex = (texture == _tex1) ? _tex2 : _tex1;
if (!_txQuantize->quantize(texture, tmptex, srcwidth, srcheight, GL_RGBA8, srcformat)) { if (!_txQuantize->quantize(texture, tmptex, srcwidth, srcheight, u32(graphics::internalcolorFormat::RGBA8), srcformat)) {
DBG_INFO(80, wst("Error: unsupported format! gfmt:%x\n"), srcformat); DBG_INFO(80, wst("Error: unsupported format! gfmt:%x\n"), srcformat);
return 0; return 0;
} }
@ -369,10 +368,9 @@ TxFilter::filter(uint8 *src, int srcwidth, int srcheight, uint16 srcformat, uint
destformat = srcformat; destformat = srcformat;
} }
} }
}
break;
#if !_16BPP_HACK #if !_16BPP_HACK
case GL_RGBA4: else if (destformat == u32(graphics::internalcolorFormat::RGBA4)) {
int scale = 1; int scale = 1;
tmptex = (texture == _tex1) ? _tex2 : _tex1; tmptex = (texture == _tex1) ? _tex2 : _tex1;
@ -438,14 +436,8 @@ TxFilter::filter(uint8 *src, int srcwidth, int srcheight, uint16 srcformat, uint
SharpFilter_4444((uint16*)texture, srcwidth, srcheight, (uint16*)tmptex, (_options & SHARP_FILTER_MASK)); SharpFilter_4444((uint16*)texture, srcwidth, srcheight, (uint16*)tmptex, (_options & SHARP_FILTER_MASK));
texture = tmptex; texture = tmptex;
} }
break;
case GL_RGB5_A1:
break;
case GL_RGB:
break;
#endif /* _16BPP_HACK */
} }
#endif /* _16BPP_HACK */
} }
/* fill in the texture info. */ /* fill in the texture info. */
@ -524,8 +516,8 @@ TxFilter::hirestex(uint64 g64crc, uint64 r_crc64, uint16 *palette, GHQTexInfo *i
* A comp comes before RGB comp. * A comp comes before RGB comp.
*/ */
// TODO: deal with palette textures // TODO: deal with palette textures
if (palette && info->format == GL_COLOR_INDEX8_EXT) { if (palette && info->format == u32(graphics::internalcolorFormat::COLOR_INDEX8)) {
DBG_INFO(80, wst("found GL_COLOR_INDEX8_EXT format. Need conversion!!\n")); DBG_INFO(80, wst("found COLOR_INDEX8 format. Need conversion!!\n"));
int width = info->width; int width = info->width;
int height = info->height; int height = info->height;
@ -537,7 +529,7 @@ TxFilter::hirestex(uint64 g64crc, uint64 r_crc64, uint16 *palette, GHQTexInfo *i
/* use palette and convert to 16bit format */ /* use palette and convert to 16bit format */
_txQuantize->P8_16BPP((uint32*)texture, (uint32*)tmptex, info->width, info->height, (uint32*)palette); _txQuantize->P8_16BPP((uint32*)texture, (uint32*)tmptex, info->width, info->height, (uint32*)palette);
texture = tmptex; texture = tmptex;
format = GL_RGB5_A1; format = u32(graphics::internalcolorFormat::RGB5_A1);
/* fill in the required info to return */ /* fill in the required info to return */
info->data = texture; info->data = texture;
@ -549,7 +541,7 @@ TxFilter::hirestex(uint64 g64crc, uint64 r_crc64, uint16 *palette, GHQTexInfo *i
/* XXX: add to hires texture cache!!! */ /* XXX: add to hires texture cache!!! */
_txHiResCache->add(r_crc64, info); _txHiResCache->add(r_crc64, info);
DBG_INFO(80, wst("GL_COLOR_INDEX8_EXT loaded as gfmt:%x!\n"), format); DBG_INFO(80, wst("COLOR_INDEX8 loaded as gfmt:%x!\n"), format);
} }
return 1; return 1;
@ -592,8 +584,8 @@ TxFilter::dmptx(uint8 *src, int width, int height, int rowStridePixel, uint16 gf
DBG_INFO(80, wst("hirestex: r_crc64:%08X %08X\n"), DBG_INFO(80, wst("hirestex: r_crc64:%08X %08X\n"),
(uint32)(r_crc64 >> 32), (uint32)(r_crc64 & 0xffffffff)); (uint32)(r_crc64 >> 32), (uint32)(r_crc64 & 0xffffffff));
if (gfmt != GL_RGBA && gfmt != GL_RGBA8) { if (gfmt != u32(graphics::colorFormat::RGBA) && gfmt != u32(graphics::internalcolorFormat::RGBA8)) {
if (!_txQuantize->quantize(src, _tex1, rowStridePixel, height, gfmt, GL_RGBA8)) if (!_txQuantize->quantize(src, _tex1, rowStridePixel, height, gfmt, u32(graphics::internalcolorFormat::RGBA8)))
return 0; return 0;
src = _tex1; src = _tex1;
} }

46
src/GLideNHQ/TxHiResCache.cpp
View File

@ -375,7 +375,7 @@ TxHiResCache::loadHiResTextures(const wchar_t * dir_path, boolean replace)
if (tmptex) { if (tmptex) {
/* check if _rgb.* and _a.* have matching size and format. */ /* check if _rgb.* and _a.* have matching size and format. */
if (!tex || width != tmpwidth || height != tmpheight || if (!tex || width != tmpwidth || height != tmpheight ||
format != GL_RGBA8 || tmpformat != GL_RGBA8) { format != u32(graphics::internalcolorFormat::RGBA8) || tmpformat != u32(graphics::internalcolorFormat::RGBA8)) {
#if !DEBUG #if !DEBUG
INFO(80, wst("-----\n")); INFO(80, wst("-----\n"));
INFO(80, wst("path: %ls\n"), dir_path.string().c_str()); INFO(80, wst("path: %ls\n"), dir_path.string().c_str());
@ -385,7 +385,7 @@ TxHiResCache::loadHiResTextures(const wchar_t * dir_path, boolean replace)
INFO(80, wst("Error: missing _rgb.*!\n")); INFO(80, wst("Error: missing _rgb.*!\n"));
} else if (width != tmpwidth || height != tmpheight) { } else if (width != tmpwidth || height != tmpheight) {
INFO(80, wst("Error: _rgb.* and _a.* have mismatched width or height!\n")); INFO(80, wst("Error: _rgb.* and _a.* have mismatched width or height!\n"));
} else if (format != GL_RGBA8 || tmpformat != GL_RGBA8) { } else if (format != u32(graphics::internalcolorFormat::RGBA8) || tmpformat != u32(graphics::internalcolorFormat::RGBA8)) {
INFO(80, wst("Error: _rgb.* or _a.* not in 32bit color!\n")); INFO(80, wst("Error: _rgb.* or _a.* not in 32bit color!\n"));
} }
if (tex) free(tex); if (tex) free(tex);
@ -480,7 +480,7 @@ TxHiResCache::loadHiResTextures(const wchar_t * dir_path, boolean replace)
DBG_INFO(80, wst("read in as %d x %d gfmt:%x\n"), tmpwidth, tmpheight, tmpformat); DBG_INFO(80, wst("read in as %d x %d gfmt:%x\n"), tmpwidth, tmpheight, tmpformat);
/* check if size and format are OK */ /* check if size and format are OK */
if (!(format == GL_RGBA8 || format == GL_COLOR_INDEX8_EXT ) || if (!(format == u32(graphics::internalcolorFormat::RGBA8) || format == u32(graphics::internalcolorFormat::COLOR_INDEX8) ) ||
(width * height) < 4) { /* TxQuantize requirement: width * height must be 4 or larger. */ (width * height) < 4) { /* TxQuantize requirement: width * height must be 4 or larger. */
free(tex); free(tex);
tex = nullptr; tex = nullptr;
@ -494,7 +494,7 @@ TxHiResCache::loadHiResTextures(const wchar_t * dir_path, boolean replace)
} }
/* analyze and determine best format to quantize */ /* analyze and determine best format to quantize */
if (format == GL_RGBA8) { if (format == u32(graphics::internalcolorFormat::RGBA8)) {
int i; int i;
int alphabits = 0; int alphabits = 0;
int fullalpha = 0; int fullalpha = 0;
@ -597,14 +597,14 @@ TxHiResCache::loadHiResTextures(const wchar_t * dir_path, boolean replace)
/* preparations based on above analysis */ /* preparations based on above analysis */
if (_maxbpp < 32 || _options & FORCE16BPP_HIRESTEX) { if (_maxbpp < 32 || _options & FORCE16BPP_HIRESTEX) {
if (alphabits == 0) destformat = GL_RGB; if (alphabits == 0) destformat = u32(graphics::internalcolorFormat::RGB8);
else if (alphabits == 1) destformat = GL_RGB5_A1; else if (alphabits == 1) destformat = u32(graphics::internalcolorFormat::RGB5_A1);
else destformat = GL_RGBA8; else destformat = u32(graphics::internalcolorFormat::RGBA8);
} else { } else {
destformat = GL_RGBA8; destformat = u32(graphics::internalcolorFormat::RGBA8);
} }
if (fmt == 4 && alphabits == 0) { if (fmt == 4 && alphabits == 0) {
destformat = GL_RGBA8; destformat = u32(graphics::internalcolorFormat::RGBA8);
/* Rice I format; I = (R + G + B) / 3 */ /* Rice I format; I = (R + G + B) / 3 */
for (i = 0; i < height * width; i++) { for (i = 0; i < height * width; i++) {
uint32 texel = ((uint32*)tex)[i]; uint32 texel = ((uint32*)tex)[i];
@ -622,7 +622,7 @@ TxHiResCache::loadHiResTextures(const wchar_t * dir_path, boolean replace)
/* XXX: only RGBA8888 for now. comeback to this later... */ /* XXX: only RGBA8888 for now. comeback to this later... */
if (format == GL_RGBA8) { if (format == u32(graphics::internalcolorFormat::RGBA8)) {
/* minification */ /* minification */
if (width > _maxwidth || height > _maxheight) { if (width > _maxwidth || height > _maxheight) {
@ -664,22 +664,18 @@ TxHiResCache::loadHiResTextures(const wchar_t * dir_path, boolean replace)
result = resError; result = resError;
break; break;
} }
switch (destformat) { if (destformat == u32(graphics::internalcolorFormat::RGBA8) ||
case GL_RGBA8: destformat == u32(graphics::internalcolorFormat::RGBA4)) {
case GL_RGBA4: if (_maxbpp < 32 || _options & FORCE16BPP_HIRESTEX)
if (_maxbpp < 32 || _options & FORCE16BPP_HIRESTEX) destformat = u32(graphics::internalcolorFormat::RGBA4);
destformat = GL_RGBA4; } else if (destformat == u32(graphics::internalcolorFormat::RGB5_A1)) {
break; if (_maxbpp < 32 || _options & FORCE16BPP_HIRESTEX)
case GL_RGB5_A1: destformat = u32(graphics::internalcolorFormat::RGB5_A1);
if (_maxbpp < 32 || _options & FORCE16BPP_HIRESTEX) } else if (destformat == u32(graphics::internalcolorFormat::RGB8)) {
destformat = GL_RGB5_A1; if (_maxbpp < 32 || _options & FORCE16BPP_HIRESTEX)
break; destformat = u32(graphics::internalcolorFormat::RGB8);
case GL_RGB:
if (_maxbpp < 32 || _options & FORCE16BPP_HIRESTEX)
destformat = GL_RGB;
break;
} }
if (_txQuantize->quantize(tex, tmptex, width, height, GL_RGBA8, destformat, 0)) { if (_txQuantize->quantize(tex, tmptex, width, height, u32(graphics::internalcolorFormat::RGBA8), destformat, 0)) {
format = destformat; format = destformat;
free(tex); free(tex);
tex = tmptex; tex = tmptex;

10
src/GLideNHQ/TxImage.cpp
View File

@ -203,7 +203,7 @@ TxImage::readPNG(FILE* fp, int* width, int* height, uint16* format)
*width = (row_bytes >> 2); *width = (row_bytes >> 2);
*height = o_height; *height = o_height;
*format = GL_RGBA8; *format = u32(graphics::internalcolorFormat::RGBA8);
#if POW2_TEXTURES #if POW2_TEXTURES
/* next power of 2 size conversions */ /* next power of 2 size conversions */
@ -490,8 +490,8 @@ uint8*
TxImage::readBMP(FILE* fp, int* width, int* height, uint16* format) TxImage::readBMP(FILE* fp, int* width, int* height, uint16* format)
{ {
/* NOTE: returned image format; /* NOTE: returned image format;
* 4, 8bit palette bmp -> GL_COLOR_INDEX8_EXT * 4, 8bit palette bmp -> COLOR_INDEX8
* 24, 32bit bmp -> GL_RGBA8 * 24, 32bit bmp -> RGBA8
*/ */
uint8 *image = nullptr; uint8 *image = nullptr;
@ -611,11 +611,11 @@ TxImage::readBMP(FILE* fp, int* width, int* height, uint16* format)
switch (bmp_ihdr.biBitCount) { switch (bmp_ihdr.biBitCount) {
case 8: case 8:
case 4: case 4:
*format = GL_COLOR_INDEX8_EXT; *format = u32(graphics::internalcolorFormat::COLOR_INDEX8);
break; break;
case 32: case 32:
case 24: case 24:
*format = GL_RGBA8; *format = u32(graphics::internalcolorFormat::RGBA8);
} }
#if POW2_TEXTURES #if POW2_TEXTURES

33
src/GLideNHQ/TxInternal.h
View File

@ -27,6 +27,7 @@
#include "Ext_TxFilter.h" #include "Ext_TxFilter.h"
#include "txWidestringWrapper.h" #include "txWidestringWrapper.h"
#include <Graphics/Parameters.h>
#ifdef WIN32 #ifdef WIN32
#define KBHIT(key) ((GetAsyncKeyState(key) & 0x8001) == 0x8001) #define KBHIT(key) ((GetAsyncKeyState(key) & 0x8001) == 0x8001)
@ -34,38 +35,6 @@
#define KBHIT(key) (0) #define KBHIT(key) (0)
#endif #endif
#ifdef OS_WINDOWS
#include <GL/gl.h>
#include <GL/glext.h>
#elif defined(GLES2)
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#ifndef GL_RGBA8
#define GL_RGBA8 0x8058
#endif
#define GL_COLOR_INDEX8_EXT 0x80E5
#elif defined(GLES3)
#include <GLES3/gl3.h>
#include <GLES3/gl3ext.h>
#define GL_COLOR_INDEX8_EXT 0x80E5
#elif defined(GLES3_1)
#include <GLES3/gl31.h>
#include <GLES3/gl3ext.h>
#define GL_COLOR_INDEX8_EXT 0x80E5
#elif defined(OS_MAC_OS_X)
#include <OpenGL/gl3.h>
#include <OpenGL/glext.h>
#ifndef GL_COLOR_INDEX8_EXT
#define GL_COLOR_INDEX8_EXT 0x80E5
#endif
#elif defined(OS_LINUX)
#include <GL/gl.h>
#include <GL/glext.h>
#elif defined(OS_ANDROID)
#include <GL/gl.h>
#include <GL/glext.h>
#endif // OS_WINDOWS
/* in-memory zlib texture compression */ /* in-memory zlib texture compression */
#define GL_TEXFMT_GZ 0x80000000 #define GL_TEXFMT_GZ 0x80000000

34
src/GLideNHQ/TxQuantize.cpp
View File

@ -837,23 +837,18 @@ TxQuantize::quantize(uint8* src, uint8* dest, int width, int height, uint16 srcf
quantizerFunc quantizer; quantizerFunc quantizer;
int bpp_shift = 0; int bpp_shift = 0;
if (destformat == GL_RGBA8 || destformat == GL_RGBA) { if (destformat == u32(graphics::internalcolorFormat::RGBA8) || destformat == u32(graphics::colorFormat::RGBA)) {
switch (srcformat) { if (srcformat == u32(graphics::internalcolorFormat::RGB5_A1)) {
case GL_RGB5_A1:
quantizer = &TxQuantize::ARGB1555_ARGB8888; quantizer = &TxQuantize::ARGB1555_ARGB8888;
bpp_shift = 1; bpp_shift = 1;
break; } else if (srcformat == u32(graphics::internalcolorFormat::RGBA4)) {
case GL_RGBA4:
quantizer = &TxQuantize::ARGB4444_ARGB8888; quantizer = &TxQuantize::ARGB4444_ARGB8888;
bpp_shift = 1; bpp_shift = 1;
break; } else if (srcformat == u32(graphics::internalcolorFormat::RGB8)) {
case GL_RGB:
quantizer = &TxQuantize::RGB565_ARGB8888; quantizer = &TxQuantize::RGB565_ARGB8888;
bpp_shift = 1; bpp_shift = 1;
break; } else
default: return 0;
return 0;
}
unsigned int numcore = _numcore; unsigned int numcore = _numcore;
unsigned int blkrow = 0; unsigned int blkrow = 0;
@ -891,23 +886,18 @@ TxQuantize::quantize(uint8* src, uint8* dest, int width, int height, uint16 srcf
(*this.*quantizer)((uint32*)src, (uint32*)dest, width, height); (*this.*quantizer)((uint32*)src, (uint32*)dest, width, height);
} }
} else if (srcformat == GL_RGBA8 || srcformat == GL_RGBA) { } else if (srcformat == u32(graphics::internalcolorFormat::RGBA8) || srcformat == u32(graphics::colorFormat::RGBA)) {
switch (destformat) { if (destformat == u32(graphics::internalcolorFormat::RGB5_A1)) {
case GL_RGB5_A1:
quantizer = fastQuantizer ? &TxQuantize::ARGB8888_ARGB1555 : &TxQuantize::ARGB8888_ARGB1555_ErrD; quantizer = fastQuantizer ? &TxQuantize::ARGB8888_ARGB1555 : &TxQuantize::ARGB8888_ARGB1555_ErrD;
bpp_shift = 1; bpp_shift = 1;
break; } else if (destformat == u32(graphics::internalcolorFormat::RGBA4)) {
case GL_RGBA4:
quantizer = fastQuantizer ? &TxQuantize::ARGB8888_ARGB4444 : &TxQuantize::ARGB8888_ARGB4444_ErrD; quantizer = fastQuantizer ? &TxQuantize::ARGB8888_ARGB4444 : &TxQuantize::ARGB8888_ARGB4444_ErrD;
bpp_shift = 1; bpp_shift = 1;
break; } else if (destformat == u32(graphics::internalcolorFormat::RGB8)) {
case GL_RGB:
quantizer = fastQuantizer ? &TxQuantize::ARGB8888_RGB565 : &TxQuantize::ARGB8888_RGB565_ErrD; quantizer = fastQuantizer ? &TxQuantize::ARGB8888_RGB565 : &TxQuantize::ARGB8888_RGB565_ErrD;
bpp_shift = 1; bpp_shift = 1;
break; } else
default: return 0;
return 0;
}
unsigned int numcore = _numcore; unsigned int numcore = _numcore;
unsigned int blkrow = 0; unsigned int blkrow = 0;

53
src/GLideNHQ/TxUtil.cpp
View File

@ -61,22 +61,17 @@ TxUtil::sizeofTx(int width, int height, uint16 format)
int dataSize = 0; int dataSize = 0;
/* a lookup table for the shifts would be better */ /* a lookup table for the shifts would be better */
switch (format) { if (format == u32(graphics::internalcolorFormat::COLOR_INDEX8)) {
case GL_COLOR_INDEX8_EXT:
dataSize = width * height; dataSize = width * height;
break; } else if (format == u32(graphics::internalcolorFormat::RGBA4) ||
case GL_RGBA4: format == u32(graphics::internalcolorFormat::RGB5_A1) ||
case GL_RGB5_A1: format == u32(graphics::internalcolorFormat::RGB8)) {
case GL_RGB:
dataSize = (width * height) << 1; dataSize = (width * height) << 1;
break; } else if (format == u32(graphics::internalcolorFormat::RGBA8)) {
case GL_RGBA8:
dataSize = (width * height) << 2; dataSize = (width * height) << 2;
break; } else {
default:
/* unsupported format */ /* unsupported format */
DBG_INFO(80, wst("Error: cannot get size. unsupported gfmt:%x\n"), format); DBG_INFO(80, wst("Error: cannot get size. unsupported gfmt:%x\n"), format);
;
} }
return dataSize; return dataSize;
@ -592,26 +587,20 @@ TxMemBuf::getThreadBuf(uint32 threadIdx, uint32 num, uint32 size)
void setTextureFormat(uint16 internalFormat, GHQTexInfo * info) void setTextureFormat(uint16 internalFormat, GHQTexInfo * info)
{ {
info->format = internalFormat; info->format = internalFormat;
switch (internalFormat) { if (internalFormat == u32(graphics::internalcolorFormat::RGBA8)) {
case GL_RGBA8: info->texture_format = u32(graphics::colorFormat::RGBA);
info->texture_format = GL_RGBA; info->pixel_type = u32(graphics::datatype::UNSIGNED_BYTE);
info->pixel_type = GL_UNSIGNED_BYTE; } else if (internalFormat == u32(graphics::internalcolorFormat::RGB8)) {
break; info->texture_format = u32(graphics::colorFormat::RED_GREEN_BLUE);
case GL_RGB: info->pixel_type = u32(graphics::datatype::UNSIGNED_SHORT_5_6_5);
info->texture_format = GL_RGB; } else if (internalFormat == u32(graphics::internalcolorFormat::RGBA4)) {
info->pixel_type = GL_UNSIGNED_SHORT_5_6_5; info->texture_format = u32(graphics::colorFormat::RGBA);
break; info->pixel_type = u32(graphics::datatype::UNSIGNED_SHORT_4_4_4_4);
case GL_RGBA4: } else if (internalFormat == u32(graphics::internalcolorFormat::RGB5_A1)) {
info->texture_format = GL_RGBA; info->texture_format = u32(graphics::colorFormat::RGBA);
info->pixel_type = GL_UNSIGNED_SHORT_4_4_4_4; info->pixel_type = u32(graphics::datatype::UNSIGNED_SHORT_5_5_5_1);
break; } else {
case GL_RGB5_A1: info->texture_format = u32(graphics::colorFormat::RGBA);
info->texture_format = GL_RGBA; info->pixel_type = u32(graphics::datatype::UNSIGNED_BYTE);
info->pixel_type = GL_UNSIGNED_SHORT_5_5_5_1;
break;
default:
info->texture_format = GL_RGBA;
info->pixel_type = GL_UNSIGNED_BYTE;
break;
} }
} }

5
src/Graphics/OpenGLContext/opengl_Parameters.cpp
View File

@ -4,6 +4,7 @@
namespace graphics { namespace graphics {
namespace colorFormat { namespace colorFormat {
ColorFormatParam RED_GREEN_BLUE(GL_RGB);
ColorFormatParam RGBA(GL_RGBA); ColorFormatParam RGBA(GL_RGBA);
ColorFormatParam RG(GL_RG); ColorFormatParam RG(GL_RG);
ColorFormatParam RED(GL_RED); ColorFormatParam RED(GL_RED);
@ -12,7 +13,7 @@ namespace graphics {
} }
namespace internalcolorFormat { namespace internalcolorFormat {
InternalColorFormatParam RGB8(GL_RGB); InternalColorFormatParam RGB8(GL_RGB8);
InternalColorFormatParam RGBA8(GL_RGBA8); InternalColorFormatParam RGBA8(GL_RGBA8);
InternalColorFormatParam RGBA4(GL_RGBA4); InternalColorFormatParam RGBA4(GL_RGBA4);
InternalColorFormatParam RGB5_A1(GL_RGB5_A1); InternalColorFormatParam RGB5_A1(GL_RGB5_A1);
@ -21,6 +22,7 @@ namespace graphics {
InternalColorFormatParam DEPTH(GL_DEPTH_COMPONENT24); InternalColorFormatParam DEPTH(GL_DEPTH_COMPONENT24);
InternalColorFormatParam RG32F(GL_RG32F); InternalColorFormatParam RG32F(GL_RG32F);
InternalColorFormatParam LUMINANCE(0x1909); InternalColorFormatParam LUMINANCE(0x1909);
InternalColorFormatParam COLOR_INDEX8(0x80E5);
} }
namespace datatype { namespace datatype {
@ -28,6 +30,7 @@ namespace graphics {
DatatypeParam UNSIGNED_SHORT(GL_UNSIGNED_SHORT); DatatypeParam UNSIGNED_SHORT(GL_UNSIGNED_SHORT);
DatatypeParam UNSIGNED_INT(GL_UNSIGNED_INT); DatatypeParam UNSIGNED_INT(GL_UNSIGNED_INT);
DatatypeParam FLOAT(GL_FLOAT); DatatypeParam FLOAT(GL_FLOAT);
DatatypeParam UNSIGNED_SHORT_5_6_5(GL_UNSIGNED_SHORT_5_6_5);
DatatypeParam UNSIGNED_SHORT_5_5_5_1(GL_UNSIGNED_SHORT_5_5_5_1); DatatypeParam UNSIGNED_SHORT_5_5_5_1(GL_UNSIGNED_SHORT_5_5_5_1);
DatatypeParam UNSIGNED_SHORT_4_4_4_4(GL_UNSIGNED_SHORT_4_4_4_4); DatatypeParam UNSIGNED_SHORT_4_4_4_4(GL_UNSIGNED_SHORT_4_4_4_4);
} }

3
src/Graphics/Parameters.h
View File

@ -4,6 +4,7 @@
namespace graphics { namespace graphics {
namespace colorFormat { namespace colorFormat {
extern ColorFormatParam RED_GREEN_BLUE; //Windows has a macro called RGB
extern ColorFormatParam RGBA; extern ColorFormatParam RGBA;
extern ColorFormatParam RG; extern ColorFormatParam RG;
extern ColorFormatParam RED; extern ColorFormatParam RED;
@ -21,6 +22,7 @@ namespace graphics {
extern InternalColorFormatParam DEPTH; extern InternalColorFormatParam DEPTH;
extern InternalColorFormatParam RG32F; extern InternalColorFormatParam RG32F;
extern InternalColorFormatParam LUMINANCE; extern InternalColorFormatParam LUMINANCE;
extern InternalColorFormatParam COLOR_INDEX8;
} }
namespace datatype { namespace datatype {
@ -28,6 +30,7 @@ namespace graphics {
extern DatatypeParam UNSIGNED_SHORT; extern DatatypeParam UNSIGNED_SHORT;
extern DatatypeParam UNSIGNED_INT; extern DatatypeParam UNSIGNED_INT;
extern DatatypeParam FLOAT; extern DatatypeParam FLOAT;
extern DatatypeParam UNSIGNED_SHORT_5_6_5;
extern DatatypeParam UNSIGNED_SHORT_5_5_5_1; extern DatatypeParam UNSIGNED_SHORT_5_5_5_1;
extern DatatypeParam UNSIGNED_SHORT_4_4_4_4; extern DatatypeParam UNSIGNED_SHORT_4_4_4_4;
} }

5
src/Platform.h
View File

@ -10,11 +10,6 @@
#include "winlnxdefs.h" #include "winlnxdefs.h"
#endif #endif
#ifdef __LIBRETRO__
#include <glsm/glsmsym.h>
#include <GLideN64_libretro.h>
#endif
#ifdef PANDORA #ifdef PANDORA
typedef char GLchar; typedef char GLchar;
#endif #endif