ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Remove the redundant pixel format index from the pixel format object.

Browse Source
This commit is contained in:
Alexandre Julliard 2012-08-15 15:44:00 +02:00
parent 451828e169
commit 5e932efbf6
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/winex11.drv/opengl.c
View File

@ -133,7 +133,6 @@ struct WineGLInfo {
struct wgl_pixel_format struct wgl_pixel_format
{ {
int iPixelFormat;
GLXFBConfig fbconfig; GLXFBConfig fbconfig;
int fmt_id; int fmt_id;
int render_type; int render_type;
@ -964,7 +963,6 @@ static void init_pixel_formats( Display *display )
} }
TRACE("Found onscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); TRACE("Found onscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i);
list[size].iPixelFormat = size+1; /* The index starts at 1 */
list[size].fbconfig = cfgs[i]; list[size].fbconfig = cfgs[i];
list[size].fmt_id = fmt_id; list[size].fmt_id = fmt_id;
list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]);
@ -976,7 +974,6 @@ static void init_pixel_formats( Display *display )
if(check_fbconfig_bitmap_capability(display, cfgs[i])) if(check_fbconfig_bitmap_capability(display, cfgs[i]))
{ {
TRACE("Found bitmap capable format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); TRACE("Found bitmap capable format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i);
list[size].iPixelFormat = size+1; /* The index starts at 1 */
list[size].fbconfig = cfgs[i]; list[size].fbconfig = cfgs[i];
list[size].fmt_id = fmt_id; list[size].fmt_id = fmt_id;
list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]);
@ -1001,7 +998,6 @@ static void init_pixel_formats( Display *display )
} }
TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i);
list[size].iPixelFormat = size+1; /* The index starts at 1 */
list[size].fbconfig = cfgs[i]; list[size].fbconfig = cfgs[i];
list[size].fmt_id = fmt_id; list[size].fmt_id = fmt_id;
list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]);
@ -1469,10 +1465,9 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx)
SetLastError(ERROR_INVALID_HANDLE); SetLastError(ERROR_INVALID_HANDLE);
return FALSE; return FALSE;
} }
if (ctx->fmt->iPixelFormat != escape.pixel_format) if (ctx->fmt - pixel_formats != escape.pixel_format - 1)
{ {
WARN( "mismatched pixel format hdc %p %u ctx %p %u\n", WARN( "mismatched pixel format hdc %p %u ctx %p\n", hdc, escape.pixel_format, ctx );
hdc, escape.pixel_format, ctx, ctx->fmt->iPixelFormat );
SetLastError( ERROR_INVALID_PIXEL_FORMAT ); SetLastError( ERROR_INVALID_PIXEL_FORMAT );
return FALSE; return FALSE;
} }