Skip to content

W
wine-winehq
Commit a28980da authored by Alex Henrie's avatar Alex Henrie Committed by Alexandre Julliard
Browse files
Options

winex11: Factor out array access in ConvertAttribWGLtoGLX (scan-build).

Signed-off-by: 's avatarAlex Henrie <alexhenrie24@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 1fcae3c2
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 33 deletions
dlls/winex11.drv/opengl.c
View file @ a28980da
...@@ -751,7 +751,7 @@ static const char *debugstr_fbconfig( GLXFBConfig fbconfig ) ...@@ -751,7 +751,7 @@ static const char *debugstr_fbconfig( GLXFBConfig fbconfig )
static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_pbuffer* pbuf) { static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_pbuffer* pbuf) {
int nAttribs = 0; int nAttribs = 0;
unsigned cur = 0; unsigned cur = 0;
int pop; int attr, pop;
int drawattrib = 0; int drawattrib = 0;
int nvfloatattrib = GLX_DONT_CARE; int nvfloatattrib = GLX_DONT_CARE;
int pixelattrib = GLX_DONT_CARE; int pixelattrib = GLX_DONT_CARE;
...@@ -759,62 +759,53 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ ...@@ -759,62 +759,53 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_
/* The list of WGL attributes is allowed to be NULL. We don't return here for NULL /* The list of WGL attributes is allowed to be NULL. We don't return here for NULL
* because we need to do fixups for GLX_DRAWABLE_TYPE/GLX_RENDER_TYPE/GLX_FLOAT_COMPONENTS_NV. */ * because we need to do fixups for GLX_DRAWABLE_TYPE/GLX_RENDER_TYPE/GLX_FLOAT_COMPONENTS_NV. */
while (iWGLAttr && 0 != iWGLAttr[cur]) { while (iWGLAttr && 0 != iWGLAttr[cur]) {
TRACE("pAttr[%d] = %x\n", cur, iWGLAttr[cur]); attr = iWGLAttr[cur];
TRACE("pAttr[%d] = %x\n", cur, attr);
pop = iWGLAttr[++cur];
switch (iWGLAttr[cur]) { switch (attr) {
case WGL_AUX_BUFFERS_ARB: case WGL_AUX_BUFFERS_ARB:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_AUX_BUFFERS, pop); PUSH2(oGLXAttr, GLX_AUX_BUFFERS, pop);
TRACE("pAttr[%d] = GLX_AUX_BUFFERS: %d\n", cur, pop); TRACE("pAttr[%d] = GLX_AUX_BUFFERS: %d\n", cur, pop);
break; break;
case WGL_COLOR_BITS_ARB: case WGL_COLOR_BITS_ARB:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_BUFFER_SIZE, pop); PUSH2(oGLXAttr, GLX_BUFFER_SIZE, pop);
TRACE("pAttr[%d] = GLX_BUFFER_SIZE: %d\n", cur, pop); TRACE("pAttr[%d] = GLX_BUFFER_SIZE: %d\n", cur, pop);
break; break;
case WGL_BLUE_BITS_ARB: case WGL_BLUE_BITS_ARB:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_BLUE_SIZE, pop); PUSH2(oGLXAttr, GLX_BLUE_SIZE, pop);
TRACE("pAttr[%d] = GLX_BLUE_SIZE: %d\n", cur, pop); TRACE("pAttr[%d] = GLX_BLUE_SIZE: %d\n", cur, pop);
break; break;
case WGL_RED_BITS_ARB: case WGL_RED_BITS_ARB:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_RED_SIZE, pop); PUSH2(oGLXAttr, GLX_RED_SIZE, pop);
TRACE("pAttr[%d] = GLX_RED_SIZE: %d\n", cur, pop); TRACE("pAttr[%d] = GLX_RED_SIZE: %d\n", cur, pop);
break; break;
case WGL_GREEN_BITS_ARB: case WGL_GREEN_BITS_ARB:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_GREEN_SIZE, pop); PUSH2(oGLXAttr, GLX_GREEN_SIZE, pop);
TRACE("pAttr[%d] = GLX_GREEN_SIZE: %d\n", cur, pop); TRACE("pAttr[%d] = GLX_GREEN_SIZE: %d\n", cur, pop);
break; break;
case WGL_ALPHA_BITS_ARB: case WGL_ALPHA_BITS_ARB:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_ALPHA_SIZE, pop); PUSH2(oGLXAttr, GLX_ALPHA_SIZE, pop);
TRACE("pAttr[%d] = GLX_ALPHA_SIZE: %d\n", cur, pop); TRACE("pAttr[%d] = GLX_ALPHA_SIZE: %d\n", cur, pop);
break; break;
case WGL_DEPTH_BITS_ARB: case WGL_DEPTH_BITS_ARB:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_DEPTH_SIZE, pop); PUSH2(oGLXAttr, GLX_DEPTH_SIZE, pop);
TRACE("pAttr[%d] = GLX_DEPTH_SIZE: %d\n", cur, pop); TRACE("pAttr[%d] = GLX_DEPTH_SIZE: %d\n", cur, pop);
break; break;
case WGL_STENCIL_BITS_ARB: case WGL_STENCIL_BITS_ARB:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_STENCIL_SIZE, pop); PUSH2(oGLXAttr, GLX_STENCIL_SIZE, pop);
TRACE("pAttr[%d] = GLX_STENCIL_SIZE: %d\n", cur, pop); TRACE("pAttr[%d] = GLX_STENCIL_SIZE: %d\n", cur, pop);
break; break;
case WGL_DOUBLE_BUFFER_ARB: case WGL_DOUBLE_BUFFER_ARB:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_DOUBLEBUFFER, pop); PUSH2(oGLXAttr, GLX_DOUBLEBUFFER, pop);
TRACE("pAttr[%d] = GLX_DOUBLEBUFFER: %d\n", cur, pop); TRACE("pAttr[%d] = GLX_DOUBLEBUFFER: %d\n", cur, pop);
break; break;
case WGL_STEREO_ARB: case WGL_STEREO_ARB:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_STEREO, pop); PUSH2(oGLXAttr, GLX_STEREO, pop);
TRACE("pAttr[%d] = GLX_STEREO: %d\n", cur, pop); TRACE("pAttr[%d] = GLX_STEREO: %d\n", cur, pop);
break; break;
case WGL_PIXEL_TYPE_ARB: case WGL_PIXEL_TYPE_ARB:
pop = iWGLAttr[++cur];
TRACE("pAttr[%d] = WGL_PIXEL_TYPE_ARB: %d\n", cur, pop); TRACE("pAttr[%d] = WGL_PIXEL_TYPE_ARB: %d\n", cur, pop);
switch (pop) { switch (pop) {
case WGL_TYPE_COLORINDEX_ARB: pixelattrib = GLX_COLOR_INDEX_BIT; break ; case WGL_TYPE_COLORINDEX_ARB: pixelattrib = GLX_COLOR_INDEX_BIT; break ;
...@@ -824,24 +815,20 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ ...@@ -824,24 +815,20 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_
case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: pixelattrib = GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT; break ; case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: pixelattrib = GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT; break ;
default: default:
ERR("unexpected PixelType(%x)\n", pop); ERR("unexpected PixelType(%x)\n", pop);
pop = 0;
} }
break; break;
case WGL_SUPPORT_GDI_ARB: case WGL_SUPPORT_GDI_ARB:
/* This flag is set in a pixel format */ /* This flag is set in a pixel format */
pop = iWGLAttr[++cur];
TRACE("pAttr[%d] = WGL_SUPPORT_GDI_ARB: %d\n", cur, pop); TRACE("pAttr[%d] = WGL_SUPPORT_GDI_ARB: %d\n", cur, pop);
break; break;
case WGL_DRAW_TO_BITMAP_ARB: case WGL_DRAW_TO_BITMAP_ARB:
/* This flag is set in a pixel format */ /* This flag is set in a pixel format */
pop = iWGLAttr[++cur];
TRACE("pAttr[%d] = WGL_DRAW_TO_BITMAP_ARB: %d\n", cur, pop); TRACE("pAttr[%d] = WGL_DRAW_TO_BITMAP_ARB: %d\n", cur, pop);
break; break;
case WGL_DRAW_TO_WINDOW_ARB: case WGL_DRAW_TO_WINDOW_ARB:
pop = iWGLAttr[++cur];
TRACE("pAttr[%d] = WGL_DRAW_TO_WINDOW_ARB: %d\n", cur, pop); TRACE("pAttr[%d] = WGL_DRAW_TO_WINDOW_ARB: %d\n", cur, pop);
/* GLX_DRAWABLE_TYPE flags need to be OR'd together. See below. */ /* GLX_DRAWABLE_TYPE flags need to be OR'd together. See below. */
if (pop) { if (pop) {
...@@ -850,7 +837,6 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ ...@@ -850,7 +837,6 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_
break; break;
case WGL_DRAW_TO_PBUFFER_ARB: case WGL_DRAW_TO_PBUFFER_ARB:
pop = iWGLAttr[++cur];
TRACE("pAttr[%d] = WGL_DRAW_TO_PBUFFER_ARB: %d\n", cur, pop); TRACE("pAttr[%d] = WGL_DRAW_TO_PBUFFER_ARB: %d\n", cur, pop);
/* GLX_DRAWABLE_TYPE flags need to be OR'd together. See below. */ /* GLX_DRAWABLE_TYPE flags need to be OR'd together. See below. */
if (pop) { if (pop) {
...@@ -860,18 +846,15 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ ...@@ -860,18 +846,15 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_
case WGL_ACCELERATION_ARB: case WGL_ACCELERATION_ARB:
/* This flag is set in a pixel format */ /* This flag is set in a pixel format */
pop = iWGLAttr[++cur];
TRACE("pAttr[%d] = WGL_ACCELERATION_ARB: %d\n", cur, pop); TRACE("pAttr[%d] = WGL_ACCELERATION_ARB: %d\n", cur, pop);
break; break;
case WGL_SUPPORT_OPENGL_ARB: case WGL_SUPPORT_OPENGL_ARB:
pop = iWGLAttr[++cur];
/** nothing to do, if we are here, supposing support Accelerated OpenGL */ /** nothing to do, if we are here, supposing support Accelerated OpenGL */
TRACE("pAttr[%d] = WGL_SUPPORT_OPENGL_ARB: %d\n", cur, pop); TRACE("pAttr[%d] = WGL_SUPPORT_OPENGL_ARB: %d\n", cur, pop);
break; break;
case WGL_SWAP_METHOD_ARB: case WGL_SWAP_METHOD_ARB:
pop = iWGLAttr[++cur];
TRACE("pAttr[%d] = WGL_SWAP_METHOD_ARB: %#x\n", cur, pop); TRACE("pAttr[%d] = WGL_SWAP_METHOD_ARB: %#x\n", cur, pop);
if (has_swap_method) if (has_swap_method)
{ {
...@@ -899,19 +882,16 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ ...@@ -899,19 +882,16 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_
break; break;
case WGL_PBUFFER_LARGEST_ARB: case WGL_PBUFFER_LARGEST_ARB:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_LARGEST_PBUFFER, pop); PUSH2(oGLXAttr, GLX_LARGEST_PBUFFER, pop);
TRACE("pAttr[%d] = GLX_LARGEST_PBUFFER: %x\n", cur, pop); TRACE("pAttr[%d] = GLX_LARGEST_PBUFFER: %x\n", cur, pop);
break; break;
case WGL_SAMPLE_BUFFERS_ARB: case WGL_SAMPLE_BUFFERS_ARB:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_SAMPLE_BUFFERS_ARB, pop); PUSH2(oGLXAttr, GLX_SAMPLE_BUFFERS_ARB, pop);
TRACE("pAttr[%d] = GLX_SAMPLE_BUFFERS_ARB: %x\n", cur, pop); TRACE("pAttr[%d] = GLX_SAMPLE_BUFFERS_ARB: %x\n", cur, pop);
break; break;
case WGL_SAMPLES_ARB: case WGL_SAMPLES_ARB:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_SAMPLES_ARB, pop); PUSH2(oGLXAttr, GLX_SAMPLES_ARB, pop);
TRACE("pAttr[%d] = GLX_SAMPLES_ARB: %x\n", cur, pop); TRACE("pAttr[%d] = GLX_SAMPLES_ARB: %x\n", cur, pop);
break; break;
...@@ -919,8 +899,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ ...@@ -919,8 +899,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_
case WGL_TEXTURE_FORMAT_ARB: case WGL_TEXTURE_FORMAT_ARB:
case WGL_TEXTURE_TARGET_ARB: case WGL_TEXTURE_TARGET_ARB:
case WGL_MIPMAP_TEXTURE_ARB: case WGL_MIPMAP_TEXTURE_ARB:
TRACE("WGL_render_texture Attributes: %x as %x\n", iWGLAttr[cur], iWGLAttr[cur + 1]); TRACE("WGL_render_texture Attributes: %x as %x\n", iWGLAttr[cur - 1], iWGLAttr[cur]);
pop = iWGLAttr[++cur];
if (NULL == pbuf) { if (NULL == pbuf) {
ERR("trying to use GLX_Pbuffer Attributes without Pbuffer (was %x)\n", iWGLAttr[cur]); ERR("trying to use GLX_Pbuffer Attributes without Pbuffer (was %x)\n", iWGLAttr[cur]);
} }
...@@ -934,7 +913,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ ...@@ -934,7 +913,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_
} }
break ; break ;
case WGL_FLOAT_COMPONENTS_NV: case WGL_FLOAT_COMPONENTS_NV:
nvfloatattrib = iWGLAttr[++cur]; nvfloatattrib = pop;
TRACE("pAttr[%d] = WGL_FLOAT_COMPONENTS_NV: %x\n", cur, nvfloatattrib); TRACE("pAttr[%d] = WGL_FLOAT_COMPONENTS_NV: %x\n", cur, nvfloatattrib);
break ; break ;
case WGL_BIND_TO_TEXTURE_DEPTH_NV: case WGL_BIND_TO_TEXTURE_DEPTH_NV:
...@@ -944,26 +923,22 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ ...@@ -944,26 +923,22 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_
case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV: case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV:
case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV: case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV:
case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV: case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV:
pop = iWGLAttr[++cur];
/** cannot be converted, see direct handling on /** cannot be converted, see direct handling on
* - wglGetPixelFormatAttribivARB * - wglGetPixelFormatAttribivARB
* TODO: wglChoosePixelFormat * TODO: wglChoosePixelFormat
*/ */
break ; break ;
case WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT: case WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT, pop); PUSH2(oGLXAttr, GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT, pop);
TRACE("pAttr[%d] = GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT: %x\n", cur, pop); TRACE("pAttr[%d] = GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT: %x\n", cur, pop);
break ; break ;
case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT:
pop = iWGLAttr[++cur];
PUSH2(oGLXAttr, GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT, pop); PUSH2(oGLXAttr, GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT, pop);
TRACE("pAttr[%d] = GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT: %x\n", cur, pop); TRACE("pAttr[%d] = GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT: %x\n", cur, pop);
break ; break ;
default: default:
FIXME("unsupported %x WGL Attribute\n", iWGLAttr[cur]); FIXME("unsupported %x WGL Attribute\n", attr);
cur++;
break; break;
} }
++cur; ++cur;
......
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