From 1efddc36d545d449d79f54f3d9f70c7944e5efc4 Mon Sep 17 00:00:00 2001 From: Jannik Vogel Date: Mon, 13 Jul 2015 17:40:38 +0200 Subject: [PATCH] Remove dead code and remind about inplace+vram --- hw/xbox/nv2a.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/hw/xbox/nv2a.c b/hw/xbox/nv2a.c index 2d3e3eb91a..bd36376489 100644 --- a/hw/xbox/nv2a.c +++ b/hw/xbox/nv2a.c @@ -2889,15 +2889,14 @@ static void pgraph_update_surface(NV2AState *d, glGenTextures(1, &pg->gl_color_buffer); glBindTexture(GL_TEXTURE_2D, pg->gl_color_buffer); -#if 0 // Removed with flipped_buf - glPixelStorei(GL_UNPACK_ROW_LENGTH, - pg->surface_color.pitch / f.bytes_per_pixel); -#endif - - uint8_t* flipped_buf = g_malloc(width * height * f.bytes_per_pixel); + /* This is VRAM so we can't do this inplace! */ + uint8_t *flipped_buf = g_malloc(width * height * f.bytes_per_pixel); unsigned int irow; for (irow = 0; irow < height; irow++) { - memcpy(&flipped_buf[width * (height - irow - 1) * f.bytes_per_pixel], &buf[pg->surface_color.pitch * irow], width * f.bytes_per_pixel); + memcpy(&flipped_buf[width * (height - irow - 1) + * f.bytes_per_pixel], + &buf[pg->surface_color.pitch * irow], + width * f.bytes_per_pixel); } glTexImage2D(GL_TEXTURE_2D, 0, f.gl_internal_format, @@ -2907,10 +2906,6 @@ static void pgraph_update_surface(NV2AState *d, g_free(flipped_buf); -#if 0 - glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); -#endif - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, @@ -3084,15 +3079,14 @@ static void pgraph_update_surface(NV2AState *d, glGenTextures(1, &pg->gl_zeta_buffer); glBindTexture(GL_TEXTURE_2D, pg->gl_zeta_buffer); -#if 0 - glPixelStorei(GL_UNPACK_ROW_LENGTH, - pg->surface_zeta.pitch / bytes_per_pixel); -#endif - - uint8_t* flipped_buf = g_malloc(width * height * bytes_per_pixel); + /* This is VRAM so we can't do this inplace! */ + uint8_t *flipped_buf = g_malloc(width * height * bytes_per_pixel); unsigned int irow; for (irow = 0; irow < height; irow++) { - memcpy(&flipped_buf[width * (height - irow - 1) * bytes_per_pixel], &buf[pg->surface_zeta.pitch * irow], width * bytes_per_pixel); + memcpy(&flipped_buf[width * (height - irow - 1) + * bytes_per_pixel], + &buf[pg->surface_zeta.pitch * irow], + width * bytes_per_pixel); } glTexImage2D(GL_TEXTURE_2D, 0, gl_internal_format, @@ -3102,10 +3096,6 @@ static void pgraph_update_surface(NV2AState *d, g_free(flipped_buf); -#if 0 - glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); -#endif - glFramebufferTexture2D(GL_FRAMEBUFFER, gl_attachment, GL_TEXTURE_2D,