Commit 8d335b82 authored by Flyinghead's avatar Flyinghead
Browse files

Use HAVE_OPENGLES instead of GLES

Fixes invisible FMV and Soulcalibur's black character
parent a2d26a57
......@@ -103,7 +103,7 @@ void palette_update(void);
// Unpack to 32-bit word
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && defined(GLES)
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && defined(HAVE_OPENGLES)
// GLES doesn't have the native ordering 8888 so we need to put bytes in the RGBA memory order.
#define ARGB1555_32( word ) ( ((word & 0x8000) ? 0xFF000000 : 0) | (((word>>10) & 0x1F)<<3) | (((word>>5) & 0x1F)<<11) | (((word>>0) & 0x1F)<<19) )
......@@ -160,7 +160,7 @@ struct pp_8888
{
__forceinline static u32 packRGB(u8 R,u8 G,u8 B)
{
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && defined(GLES)
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && defined(HAVE_OPENGLES)
return (R << 0) | (G << 8) | (B << 16) | 0xFF000000;
#else
return (R << 24) | (G << 16) | (B << 8) | 0xFF;
......
......@@ -55,9 +55,6 @@ struct gl_ctx
struct
{
GLuint geometry,modvols,idxs,idxs2;
#ifndef GLES
GLuint vao;
#endif
} vbo;
const char *gl_version;
......
......@@ -369,7 +369,7 @@ struct TextureCacheData
{
glcache.BindTexture(GL_TEXTURE_2D, texID);
GLuint comps=textype==GL_UNSIGNED_SHORT_5_6_5?GL_RGB:GL_RGBA;
#ifdef GLES
#ifdef HAVE_OPENGLES
GLuint actual_textype = textype == GL_UNSIGNED_INT_8_8_8_8 ? GL_UNSIGNED_BYTE : textype;
glTexImage2D(GL_TEXTURE_2D, 0,comps , upscaled_w, upscaled_h, 0, comps, actual_textype, temp_tex_buffer);
#else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment