ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(GL) Optimization to gl_copy_frame

This commit is contained in:
twinaphex 2014-10-01 17:15:02 +02:00
parent d982350702
commit a0dabeb4ac
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gfx/gl.c
View File

@ -1329,8 +1329,8 @@ static inline void gl_copy_frame(gl_t *gl, const void *frame, unsigned width, un
if (width != pitch_width) if (width != pitch_width)
{ {
/* conv_buffer - this buffer is /* Slow path - conv_buffer is preallocated
* preallocated in case we hit this path. */ * just in case we hit this path. */
unsigned h; unsigned h;
const unsigned line_bytes = width * gl->base_size; const unsigned line_bytes = width * gl->base_size;
@ -1361,30 +1361,21 @@ static inline void gl_copy_frame(gl_t *gl, const void *frame, unsigned width, un
glUnmapBuffer(GL_TEXTURE_REFERENCE_BUFFER_SCE); glUnmapBuffer(GL_TEXTURE_REFERENCE_BUFFER_SCE);
#else #else
const GLvoid *data_buf = frame;
glPixelStorei(GL_UNPACK_ALIGNMENT, get_alignment(pitch)); glPixelStorei(GL_UNPACK_ALIGNMENT, get_alignment(pitch));
if (gl->base_size == 2)
{
const void *buf = frame;
if (!gl->have_es2_compat)
{
// Convert to 32-bit textures on desktop GL.
gl_convert_frame_rgb16_32(gl, gl->conv_buffer, frame, width, height, pitch);
buf = gl->conv_buffer;
}
else
glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch / gl->base_size);
glTexSubImage2D(GL_TEXTURE_2D, if (gl->base_size == 2 && !gl->have_es2_compat)
0, 0, 0, width, height, gl->texture_type, {
gl->texture_fmt, buf); /* Convert to 32-bit textures on desktop GL. */
gl_convert_frame_rgb16_32(gl, gl->conv_buffer, frame, width, height, pitch);
data_buf = gl->conv_buffer;
} }
else else
{
glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch / gl->base_size); glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch / gl->base_size);
glTexSubImage2D(GL_TEXTURE_2D,
0, 0, 0, width, height, gl->texture_type, glTexSubImage2D(GL_TEXTURE_2D,
gl->texture_fmt, frame); 0, 0, 0, width, height, gl->texture_type,
} gl->texture_fmt, data_buf);
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
#endif #endif