mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GL1) Buildfix + cleanups

Browse Source
This commit is contained in:
twinaphex 2019-10-01 03:14:18 +02:00
parent b0b3abe775
commit 547f8968aa
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gfx/drivers/gl1.c
View File

@ -387,7 +387,7 @@ static void *gl1_gfx_init(const video_info_t *video,
video->is_threaded, video->is_threaded,
FONT_DRIVER_RENDER_OPENGL1_API); FONT_DRIVER_RENDER_OPENGL1_API);
gl1->smooth = settings->bools.video_smooth; gl1->smooth = settings->bools.video_smooth;
gl1->supports_bgra = string_list_find_elem(gl1->extensions, "GL_EXT_bgra"); gl1->supports_bgra = string_list_find_elem(gl1->extensions, "GL_EXT_bgra");
glDisable(GL_BLEND); glDisable(GL_BLEND);
@ -546,10 +546,12 @@ void gl1_gfx_set_viewport(gl1_t *gl1,
static void draw_tex(gl1_t *gl1, int pot_width, int pot_height, int width, int height, GLuint tex, const void *frame_to_copy) static void draw_tex(gl1_t *gl1, int pot_width, int pot_height, int width, int height, GLuint tex, const void *frame_to_copy)
{ {
uint8_t *frame = NULL;
uint8_t *frame_rgba = NULL;
/* FIXME: For now, everything is uploaded as BGRA8888, I could not get 444 or 555 to work, and there is no 565 support in GL 1.1 either. */ /* FIXME: For now, everything is uploaded as BGRA8888, I could not get 444 or 555 to work, and there is no 565 support in GL 1.1 either. */
GLint internalFormat = GL_RGB8; GLint internalFormat = GL_RGB8;
GLenum format = (gl1->supports_bgra ? GL_BGRA_EXT : GL_RGBA); GLenum format = gl1->supports_bgra ? GL_BGRA_EXT : GL_RGBA;
GLenum type = GL_UNSIGNED_BYTE; GLenum type = GL_UNSIGNED_BYTE;
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
@ -557,7 +559,7 @@ static void draw_tex(gl1_t *gl1, int pot_width, int pot_height, int width, int h
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
/* multi-texture not part of GL 1.1 */ /* Multi-texture not part of GL 1.1 */
/*glActiveTexture(GL_TEXTURE0);*/ /*glActiveTexture(GL_TEXTURE0);*/
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
@ -568,15 +570,18 @@ static void draw_tex(gl1_t *gl1, int pot_width, int pot_height, int width, int h
so we send the frame as dummy data */ so we send the frame as dummy data */
glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, pot_width, pot_height, 0, format, type, frame_to_copy); glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, pot_width, pot_height, 0, format, type, frame_to_copy);
uint8_t *frame = (uint8_t*)frame_to_copy; frame = (uint8_t*)frame_to_copy;
uint8_t *frame_rgba = NULL; if (!gl1->supports_bgra)
if (!gl1->supports_bgra) { {
frame_rgba = (uint8_t*)malloc(pot_width * pot_height * 4); frame_rgba = (uint8_t*)malloc(pot_width * pot_height * 4);
if (frame_rgba) { if (frame_rgba)
{
int x, y; int x, y;
for (y = 0; y < pot_height; y++) { for (y = 0; y < pot_height; y++)
for (x = 0; x < pot_width; x++) { {
int index = (y * pot_width + x) * 4; for (x = 0; x < pot_width; x++)
{
int index = (y * pot_width + x) * 4;
frame_rgba[index + 2] = frame[index + 0]; frame_rgba[index + 2] = frame[index + 0];
frame_rgba[index + 1] = frame[index + 1]; frame_rgba[index + 1] = frame[index + 1];
frame_rgba[index + 0] = frame[index + 2]; frame_rgba[index + 0] = frame[index + 2];
@ -635,16 +640,16 @@ static void draw_tex(gl1_t *gl1, int pot_width, int pot_height, int width, int h
glBegin(GL_QUADS); glBegin(GL_QUADS);
{ {
float tex_BL[2] = {0.0f, 0.0f}; float tex_BL[2] = {0.0f, 0.0f};
float tex_BR[2] = {1.0f, 0.0f}; float tex_BR[2] = {1.0f, 0.0f};
float tex_TL[2] = {0.0f, 1.0f}; float tex_TL[2] = {0.0f, 1.0f};
float tex_TR[2] = {1.0f, 1.0f}; float tex_TR[2] = {1.0f, 1.0f};
float *tex_mirror_BL = tex_TL; float *tex_mirror_BL = tex_TL;
float *tex_mirror_BR = tex_TR; float *tex_mirror_BR = tex_TR;
float *tex_mirror_TL = tex_BL; float *tex_mirror_TL = tex_BL;
float *tex_mirror_TR = tex_BR; float *tex_mirror_TR = tex_BR;
float norm_width = (1.0f / (float)pot_width) * (float)width; float norm_width = (1.0f / (float)pot_width) * (float)width;
float norm_height = (1.0f / (float)pot_height) * (float)height; float norm_height = (1.0f / (float)pot_height) * (float)height;
/* remove extra POT padding */ /* remove extra POT padding */
tex_mirror_BR[0] = norm_width; tex_mirror_BR[0] = norm_width;