July 2012 - Wine-commits - list.winehq.org

Matteo Bruni : d3dcompiler: Parse unary and prefix operators.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: f2b5f71218e40e9afe87c33a3db47c65bfd10678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b5f71218e40e9afe87c33a3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 20 16:37:38 2012 +0200 d3dcompiler: Parse unary and prefix operators. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 8 ++++ dlls/d3dcompiler_43/hlsl.y | 58 +++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 32d378a..769bf74 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -904,6 +904,14 @@ struct parse_variable_def struct list *initializer; }; +enum parse_unary_op +{ + UNARY_OP_PLUS, + UNARY_OP_MINUS, + UNARY_OP_LOGICNOT, + UNARY_OP_BITNOT, +}; + struct hlsl_parse_ctx { const char **source_files; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c84736b..6cc2150 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -206,6 +206,7 @@ static unsigned int components_count_expr_list(struct list *list) struct hlsl_ir_function_decl *function; struct parse_parameter parameter; struct parse_variable_def *variable_def; + enum parse_unary_op unary_op; } %token KW_BLENDSTATE @@ -350,6 +351,7 @@ static unsigned int components_count_expr_list(struct list *list) %type <instr> conditional_expr %type <instr> assignment_expr %type <list> expr_statement +%type <unary_op> unary_op %type <modifiers> input_mod %% @@ -982,6 +984,62 @@ unary_expr: postfix_expr { $$ = $1; } + | OP_INC unary_expr + { + struct hlsl_ir_node *operands[3]; + struct source_location loc; + + operands[0] = $2; + operands[1] = operands[2] = NULL; + set_location(&loc, &@1); + $$ = &new_expr(HLSL_IR_BINOP_PREINC, operands, &loc)->node; + } + | OP_DEC unary_expr + { + struct hlsl_ir_node *operands[3]; + struct source_location loc; + + operands[0] = $2; + operands[1] = operands[2] = NULL; + set_location(&loc, &@1); + $$ = &new_expr(HLSL_IR_BINOP_PREDEC, operands, &loc)->node; + } + | unary_op unary_expr + { + enum hlsl_ir_expr_op ops[] = {0, HLSL_IR_UNOP_NEG, + HLSL_IR_UNOP_LOGIC_NOT, HLSL_IR_UNOP_BIT_NOT}; + struct hlsl_ir_node *operands[3]; + struct source_location loc; + + if ($1 == UNARY_OP_PLUS) + { + $$ = $2; + } + else + { + operands[0] = $2; + operands[1] = operands[2] = NULL; + set_location(&loc, &@1); + $$ = &new_expr(ops[$1], operands, &loc)->node; + } + } + +unary_op: '+' + { + $$ = UNARY_OP_PLUS; + } + | '-' + { + $$ = UNARY_OP_MINUS; + } + | '!' + { + $$ = UNARY_OP_LOGICNOT; + } + | '~' + { + $$ = UNARY_OP_BITNOT; + } mul_expr: unary_expr {

1 0

Matteo Bruni : d3dcompiler: "void" is not a plain scalar data type.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: fbb7e20ffdfead8108c2ba444417e29aa7305183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbb7e20ffdfead8108c2ba444… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 20 16:37:39 2012 +0200 d3dcompiler: "void" is not a plain scalar data type. It can't be used in expressions and the like. This change indirectly takes care of most of the checks. --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 6cc2150..177330f 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -568,7 +568,7 @@ type: base_type base_type: KW_VOID { - $$ = new_hlsl_type(d3dcompiler_strdup("void"), HLSL_CLASS_SCALAR, HLSL_TYPE_VOID, 1, 1); + $$ = new_hlsl_type(d3dcompiler_strdup("void"), HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); } | KW_SAMPLER {

1 0

Matteo Bruni : d3dcompiler: Stub assignment parsing.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 6ccbccbb29cc2a44f375c0be10718e58f38626cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ccbccbb29cc2a44f375c0be1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 20 16:37:40 2012 +0200 d3dcompiler: Stub assignment parsing. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 15 ++++++++ dlls/d3dcompiler_43/hlsl.y | 51 +++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 769bf74..efba080 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -912,6 +912,21 @@ enum parse_unary_op UNARY_OP_BITNOT, }; +enum parse_assign_op +{ + ASSIGN_OP_ASSIGN, + ASSIGN_OP_ADD, + ASSIGN_OP_SUB, + ASSIGN_OP_MUL, + ASSIGN_OP_DIV, + ASSIGN_OP_MOD, + ASSIGN_OP_LSHIFT, + ASSIGN_OP_RSHIFT, + ASSIGN_OP_AND, + ASSIGN_OP_OR, + ASSIGN_OP_XOR, +}; + struct hlsl_parse_ctx { const char **source_files; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 177330f..6184d6a 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -207,6 +207,7 @@ static unsigned int components_count_expr_list(struct list *list) struct parse_parameter parameter; struct parse_variable_def *variable_def; enum parse_unary_op unary_op; + enum parse_assign_op assign_op; } %token KW_BLENDSTATE @@ -352,6 +353,7 @@ static unsigned int components_count_expr_list(struct list *list) %type <instr> assignment_expr %type <list> expr_statement %type <unary_op> unary_op +%type <assign_op> assign_op %type <modifiers> input_mod %% @@ -1209,6 +1211,55 @@ assignment_expr: conditional_expr { $$ = $1; } + | unary_expr assign_op assignment_expr + { + FIXME("Assignment\n"); + } + +assign_op: '=' + { + $$ = ASSIGN_OP_ASSIGN; + } + | OP_ADDASSIGN + { + $$ = ASSIGN_OP_ADD; + } + | OP_SUBASSIGN + { + $$ = ASSIGN_OP_SUB; + } + | OP_MULASSIGN + { + $$ = ASSIGN_OP_MUL; + } + | OP_DIVASSIGN + { + $$ = ASSIGN_OP_DIV; + } + | OP_MODASSIGN + { + $$ = ASSIGN_OP_MOD; + } + | OP_LEFTSHIFTASSIGN + { + $$ = ASSIGN_OP_LSHIFT; + } + | OP_RIGHTSHIFTASSIGN + { + $$ = ASSIGN_OP_RSHIFT; + } + | OP_ANDASSIGN + { + $$ = ASSIGN_OP_AND; + } + | OP_ORASSIGN + { + $$ = ASSIGN_OP_OR; + } + | OP_XORASSIGN + { + $$ = ASSIGN_OP_XOR; + } expr: assignment_expr {

1 0

Alexandre Julliard : opengl32: Add supported wgl extension functions to the OpenGL function table.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 1b9455e65d169ebff45c7c2fccab66dc5942e4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9455e65d169ebff45c7c2fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 00:00:55 2012 +0200 opengl32: Add supported wgl extension functions to the OpenGL function table. --- dlls/opengl32/make_opengl | 121 +++++++++++----- dlls/opengl32/opengl_ext.c | 32 ++++- dlls/opengl32/opengl_ext.h | 3 + dlls/opengl32/opengl_norm.c | 4 - dlls/opengl32/wgl.c | 328 +++++++++++++++++++++++++++++++++++++------ dlls/winex11.drv/opengl.c | 306 +++++++++++------------------------------ include/wine/wgl_driver.h | 25 +++- 7 files changed, 501 insertions(+), 318 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b9455e65d169ebff45c7…

1 0

Alexandre Julliard : opengl32: Add a mechanism for managing different types of OpenGL handles.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 98bd066c952c4d54a44c6da18521a0b6363f4a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98bd066c952c4d54a44c6da18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 12:27:19 2012 +0200 opengl32: Add a mechanism for managing different types of OpenGL handles. --- dlls/opengl32/wgl.c | 80 ++++++++++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 35 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 85eaf22..b06847c 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -78,12 +78,22 @@ extern BOOL WINAPI GdiSwapBuffers( HDC hdc ); #define MAX_WGL_HANDLES 1024 +enum wgl_handle_type +{ + HANDLE_CONTEXT = 0 << 12, + HANDLE_TYPE_MASK = 15 << 12 +}; + struct wgl_handle { UINT handle; DWORD tid; - struct wgl_context *context; struct opengl_funcs *funcs; + union + { + struct wgl_context *context; /* for HANDLE_CONTEXT */ + struct wgl_handle *next; /* for free handles */ + } u; }; static struct wgl_handle wgl_handles[MAX_WGL_HANDLES]; @@ -106,24 +116,24 @@ static inline struct opengl_funcs *get_dc_funcs( HDC hdc ) return funcs; } -static inline HGLRC next_handle( struct wgl_handle *ptr ) +static inline HANDLE next_handle( struct wgl_handle *ptr, enum wgl_handle_type type ) { WORD generation = HIWORD( ptr->handle ) + 1; if (!generation) generation++; - ptr->handle = MAKELONG( ptr - wgl_handles, generation ); + ptr->handle = MAKELONG( ptr - wgl_handles, generation ) | type; return ULongToHandle( ptr->handle ); } -/* the current handle is assumed valid and doesn't need locking */ -static inline struct wgl_handle *get_current_handle_ptr(void) +/* the current context is assumed valid and doesn't need locking */ +static inline struct wgl_handle *get_current_context_ptr(void) { if (!NtCurrentTeb()->glCurrentRC) return NULL; - return &wgl_handles[LOWORD(NtCurrentTeb()->glCurrentRC)]; + return &wgl_handles[LOWORD(NtCurrentTeb()->glCurrentRC) & ~HANDLE_TYPE_MASK]; } -static struct wgl_handle *get_handle_ptr( HGLRC handle ) +static struct wgl_handle *get_handle_ptr( HANDLE handle, enum wgl_handle_type type ) { - unsigned int index = LOWORD( handle ); + unsigned int index = LOWORD( handle ) & ~HANDLE_TYPE_MASK; EnterCriticalSection( &wgl_section ); if (index < handle_count && ULongToHandle(wgl_handles[index].handle) == handle) @@ -139,22 +149,22 @@ static void release_handle_ptr( struct wgl_handle *ptr ) if (ptr) LeaveCriticalSection( &wgl_section ); } -static HGLRC alloc_handle( struct wgl_context *context, struct opengl_funcs *funcs ) +static HANDLE alloc_handle( enum wgl_handle_type type, struct opengl_funcs *funcs, void *user_ptr ) { - HGLRC handle = 0; + HANDLE handle = 0; struct wgl_handle *ptr = NULL; EnterCriticalSection( &wgl_section ); if ((ptr = next_free)) - next_free = (struct wgl_handle *)next_free->context; + next_free = next_free->u.next; else if (handle_count < MAX_WGL_HANDLES) ptr = &wgl_handles[handle_count++]; if (ptr) { - ptr->context = context; ptr->funcs = funcs; - handle = next_handle( ptr ); + ptr->u.context = user_ptr; + handle = next_handle( ptr, type ); } else SetLastError( ERROR_NOT_ENOUGH_MEMORY ); LeaveCriticalSection( &wgl_section ); @@ -164,7 +174,7 @@ static HGLRC alloc_handle( struct wgl_context *context, struct opengl_funcs *fun static void free_handle_ptr( struct wgl_handle *ptr ) { ptr->handle |= 0xffff; - ptr->context = (struct wgl_context *)next_free; + ptr->u.next = next_free; ptr->funcs = NULL; next_free = ptr; LeaveCriticalSection( &wgl_section ); @@ -187,11 +197,11 @@ BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) struct wgl_handle *src, *dst; BOOL ret = FALSE; - if (!(src = get_handle_ptr( hglrcSrc ))) return FALSE; - if ((dst = get_handle_ptr( hglrcDst ))) + if (!(src = get_handle_ptr( hglrcSrc, HANDLE_CONTEXT ))) return FALSE; + if ((dst = get_handle_ptr( hglrcDst, HANDLE_CONTEXT ))) { if (src->funcs != dst->funcs) SetLastError( ERROR_INVALID_HANDLE ); - else ret = src->funcs->wgl.p_wglCopyContext( src->context, dst->context, mask ); + else ret = src->funcs->wgl.p_wglCopyContext( src->u.context, dst->u.context, mask ); } release_handle_ptr( dst ); release_handle_ptr( src ); @@ -203,7 +213,7 @@ BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) */ BOOL WINAPI wglDeleteContext(HGLRC hglrc) { - struct wgl_handle *ptr = get_handle_ptr( hglrc ); + struct wgl_handle *ptr = get_handle_ptr( hglrc, HANDLE_CONTEXT ); if (!ptr) return FALSE; @@ -214,7 +224,7 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc) return FALSE; } if (hglrc == NtCurrentTeb()->glCurrentRC) wglMakeCurrent( 0, 0 ); - ptr->funcs->wgl.p_wglDeleteContext( ptr->context ); + ptr->funcs->wgl.p_wglDeleteContext( ptr->u.context ); free_handle_ptr( ptr ); return TRUE; } @@ -225,14 +235,14 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc) BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) { BOOL ret = TRUE; - struct wgl_handle *ptr, *prev = get_current_handle_ptr(); + struct wgl_handle *ptr, *prev = get_current_context_ptr(); if (hglrc) { - if (!(ptr = get_handle_ptr( hglrc ))) return FALSE; + if (!(ptr = get_handle_ptr( hglrc, HANDLE_CONTEXT ))) return FALSE; if (!ptr->tid || ptr->tid == GetCurrentThreadId()) { - ret = ptr->funcs->wgl.p_wglMakeCurrent( hdc, ptr->context ); + ret = ptr->funcs->wgl.p_wglMakeCurrent( hdc, ptr->u.context ); if (ret) { if (prev) prev->tid = 0; @@ -276,11 +286,11 @@ HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attrib struct opengl_funcs *funcs = get_dc_funcs( hdc ); if (!funcs || !funcs->ext.p_wglCreateContextAttribsARB) return 0; - if (share && !(share_ptr = get_handle_ptr( share ))) return 0; - if ((context = funcs->ext.p_wglCreateContextAttribsARB( hdc, share_ptr ? share_ptr->context : NULL, + if (share && !(share_ptr = get_handle_ptr( share, HANDLE_CONTEXT ))) return 0; + if ((context = funcs->ext.p_wglCreateContextAttribsARB( hdc, share_ptr ? share_ptr->u.context : NULL, attribs ))) { - ret = alloc_handle( context, funcs ); + ret = alloc_handle( HANDLE_CONTEXT, funcs, context ); if (!ret) funcs->wgl.p_wglDeleteContext( context ); } release_handle_ptr( share_ptr ); @@ -296,15 +306,15 @@ HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attrib BOOL WINAPI wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC hglrc ) { BOOL ret = TRUE; - struct wgl_handle *ptr, *prev = get_current_handle_ptr(); + struct wgl_handle *ptr, *prev = get_current_context_ptr(); if (hglrc) { - if (!(ptr = get_handle_ptr( hglrc ))) return FALSE; + if (!(ptr = get_handle_ptr( hglrc, HANDLE_CONTEXT ))) return FALSE; if (!ptr->tid || ptr->tid == GetCurrentThreadId()) { ret = (ptr->funcs->ext.p_wglMakeContextCurrentARB && - ptr->funcs->ext.p_wglMakeContextCurrentARB( draw_hdc, read_hdc, ptr->context )); + ptr->funcs->ext.p_wglMakeContextCurrentARB( draw_hdc, read_hdc, ptr->u.context )); if (ret) { if (prev) prev->tid = 0; @@ -351,11 +361,11 @@ BOOL WINAPI wglShareLists(HGLRC hglrcSrc, HGLRC hglrcDst) BOOL ret = FALSE; struct wgl_handle *src, *dst; - if (!(src = get_handle_ptr( hglrcSrc ))) return FALSE; - if ((dst = get_handle_ptr( hglrcDst ))) + if (!(src = get_handle_ptr( hglrcSrc, HANDLE_CONTEXT ))) return FALSE; + if ((dst = get_handle_ptr( hglrcDst, HANDLE_CONTEXT ))) { if (src->funcs != dst->funcs) SetLastError( ERROR_INVALID_HANDLE ); - else ret = src->funcs->wgl.p_wglShareLists( src->context, dst->context ); + else ret = src->funcs->wgl.p_wglShareLists( src->u.context, dst->u.context ); } release_handle_ptr( dst ); release_handle_ptr( src ); @@ -367,9 +377,9 @@ BOOL WINAPI wglShareLists(HGLRC hglrcSrc, HGLRC hglrcDst) */ HDC WINAPI wglGetCurrentDC(void) { - struct wgl_handle *context = get_current_handle_ptr(); + struct wgl_handle *context = get_current_context_ptr(); if (!context) return 0; - return context->funcs->wgl.p_wglGetCurrentDC( context->context ); + return context->funcs->wgl.p_wglGetCurrentDC( context->u.context ); } /*********************************************************************** @@ -383,7 +393,7 @@ HGLRC WINAPI wglCreateContext(HDC hdc) if (!funcs) return 0; if (!(context = funcs->wgl.p_wglCreateContext( hdc ))) return 0; - ret = alloc_handle( context, funcs ); + ret = alloc_handle( HANDLE_CONTEXT, funcs, context ); if (!ret) funcs->wgl.p_wglDeleteContext( context ); return ret; } @@ -696,7 +706,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) void *local_func; OpenGL_extension ext; const OpenGL_extension *ext_ret; - struct wgl_handle *context = get_current_handle_ptr(); + struct wgl_handle *context = get_current_context_ptr(); TRACE("(%s)\n", lpszProc);

1 0

Alexandre Julliard : opengl32: Use proper handles for PBuffers instead of raw pointers.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 6a3aa4eb497da281a0700302dbd7f8757dd82a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a3aa4eb497da281a0700302d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 12:25:01 2012 +0200 opengl32: Use proper handles for PBuffers instead of raw pointers. --- dlls/opengl32/make_opengl | 7 ++- dlls/opengl32/tests/opengl.c | 2 +- dlls/opengl32/wgl.c | 80 ++++++++++++++++++++++++--------------- dlls/winex11.drv/opengl.c | 85 +++++++++++++++--------------------------- include/wine/wgl_driver.h | 19 +++++---- 5 files changed, 95 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a3aa4eb497da281a0700…

1 0

Alexandre Julliard : winex11: Remove unused fields in the PBuffer object.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 76ae99a426ce31bd32a59aa616aeeebba5529ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ae99a426ce31bd32a59aa61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 12:35:24 2012 +0200 winex11: Remove unused fields in the PBuffer object. --- dlls/winex11.drv/opengl.c | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 83cc90d..5d1c5a8 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -163,13 +163,10 @@ struct wgl_context struct wgl_pbuffer { Drawable drawable; - Display* display; WineGLPixelFormat* fmt; int width; int height; int* attribList; - HDC hdc; - int use_render_texture; /* This is also the internal texture format */ int texture_bind_target; int texture_bpp; @@ -1968,16 +1965,10 @@ static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat TRACE("(%p, %d, %d, %d, %p)\n", hdc, iPixelFormat, iWidth, iHeight, piAttribList); - if (0 >= iPixelFormat) { - ERR("(%p): unexpected iPixelFormat(%d) <= 0, returns NULL\n", hdc, iPixelFormat); - SetLastError(ERROR_INVALID_PIXEL_FORMAT); - return NULL; /* unexpected error */ - } - /* Convert the WGL pixelformat to a GLX format, if it fails then the format is invalid */ fmt = ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, TRUE /* Offscreen */, &nCfgs); if(!fmt) { - ERR("(%p): unexpected iPixelFormat(%d) > nFormats(%d), returns NULL\n", hdc, iPixelFormat, nCfgs); + ERR("(%p): invalid pixel format %d\n", hdc, iPixelFormat); SetLastError(ERROR_INVALID_PIXEL_FORMAT); return NULL; } @@ -1987,8 +1978,6 @@ static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat SetLastError(ERROR_NO_SYSTEM_RESOURCES); return NULL; } - object->hdc = hdc; - object->display = gdi_display; object->width = iWidth; object->height = iHeight; object->fmt = fmt; @@ -2156,7 +2145,7 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) TRACE("(%p)\n", object); wine_tsx11_lock(); - pglXDestroyPbuffer(object->display, object->drawable); + pglXDestroyPbuffer(gdi_display, object->drawable); wine_tsx11_unlock(); HeapFree(GetProcessHeap(), 0, object); return GL_TRUE; @@ -2201,12 +2190,12 @@ static BOOL X11DRV_wglQueryPbufferARB( struct wgl_pbuffer *object, int iAttribut switch (iAttribute) { case WGL_PBUFFER_WIDTH_ARB: wine_tsx11_lock(); - pglXQueryDrawable(object->display, object->drawable, GLX_WIDTH, (unsigned int*) piValue); + pglXQueryDrawable(gdi_display, object->drawable, GLX_WIDTH, (unsigned int*) piValue); wine_tsx11_unlock(); break; case WGL_PBUFFER_HEIGHT_ARB: wine_tsx11_lock(); - pglXQueryDrawable(object->display, object->drawable, GLX_HEIGHT, (unsigned int*) piValue); + pglXQueryDrawable(gdi_display, object->drawable, GLX_HEIGHT, (unsigned int*) piValue); wine_tsx11_unlock(); break; @@ -2757,7 +2746,7 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) opengl_funcs.gl.p_glCopyTexImage2D(object->texture_target, 0, object->use_render_texture, 0, 0, object->width, object->height, 0); /* Switch back to the original drawable and upload the pbuffer-texture */ - pglXMakeCurrent(object->display, prev_drawable, prev_context); + pglXMakeCurrent(gdi_display, prev_drawable, prev_context); pglXDestroyContext(gdi_display, tmp_context); wine_tsx11_unlock(); return GL_TRUE;

1 0

Alexandre Julliard : winex11: Get rid of the glGetIntegerv wrapper.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 72e873873e1549e9b3a23d726552264a7ba51f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e873873e1549e9b3a23d726… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 13:21:20 2012 +0200 winex11: Get rid of the glGetIntegerv wrapper. --- dlls/winex11.drv/opengl.c | 42 +----------------------------------------- 1 files changed, 1 insertions(+), 41 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5d1c5a8..c4b364e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -316,11 +316,9 @@ static void (*pglXCopySubBufferMESA)(Display *dpy, GLXDrawable drawable, int x, /* Standard OpenGL */ static void (*pglFinish)(void); static void (*pglFlush)(void); -static void (*pglGetIntegerv)(GLenum,GLint*); static void wglFinish(void); static void wglFlush(void); -static void wglGetIntegerv(GLenum pname, GLint* params); static int GLXErrorHandler(Display *dpy, XErrorEvent *event, void *arg) { @@ -494,7 +492,6 @@ static BOOL has_opengl(void) do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = w##func; } while(0) REDIRECT( glFinish ); REDIRECT( glFlush ); - REDIRECT( glGetIntegerv ); #undef REDIRECT pglXGetProcAddressARB = wine_dlsym(opengl_handle, "glXGetProcAddressARB", NULL, 0); @@ -1730,43 +1727,6 @@ static HDC glxdrv_wglGetCurrentDC( struct wgl_context *ctx ) return ctx->hdc; } -/* WGL helper function which handles differences in glGetIntegerv from WGL and GLX */ -static void wglGetIntegerv(GLenum pname, GLint* params) -{ - wine_tsx11_lock(); - switch(pname) - { - case GL_DEPTH_BITS: - { - struct wgl_context *ctx = NtCurrentTeb()->glContext; - - pglGetIntegerv(pname, params); - /** - * if we cannot find a Wine Context - * we only have the default wine desktop context, - * so if we have only a 24 depth say we have 32 - */ - if (!ctx && *params == 24) { - *params = 32; - } - TRACE("returns GL_DEPTH_BITS as '%d'\n", *params); - break; - } - case GL_ALPHA_BITS: - { - struct wgl_context *ctx = NtCurrentTeb()->glContext; - - pglXGetFBConfigAttrib(gdi_display, ctx->fmt->fbconfig, GLX_ALPHA_SIZE, params); - TRACE("returns GL_ALPHA_BITS as '%d'\n", *params); - break; - } - default: - pglGetIntegerv(pname, params); - break; - } - wine_tsx11_unlock(); -} - static void flush_pixmap( struct wgl_context *ctx ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; @@ -2735,7 +2695,7 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) TRACE("drawable=%lx, context=%p\n", object->drawable, prev_context); tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); - pglGetIntegerv(object->texture_bind_target, &prev_binded_texture); + opengl_funcs.gl.p_glGetIntegerv(object->texture_bind_target, &prev_binded_texture); /* Switch to our pbuffer */ pglXMakeCurrent(gdi_display, object->drawable, tmp_context);

1 0

Alexandre Julliard : wined3d: Fetch GL functions from the WGL driver table, including glFinish and glFlush.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: d7250e97edfeb628f6076cba34828c3789fec5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7250e97edfeb628f6076cba3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 15:37:25 2012 +0200 wined3d: Fetch GL functions from the WGL driver table, including glFinish and glFlush. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/buffer.c | 6 +++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 21 ++++++++------------- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 16 ++++++++-------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_gl.h | 13 ++++--------- 8 files changed, 28 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7250e97edfeb628f6076…

1 0

Nozomi Kodama : d3dx9_36: Add some traces.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 3c278d7ec3ee7394a918e0fa9af6e7a95c3accea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c278d7ec3ee7394a918e0fa9… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Fri Jul 20 04:32:50 2012 +0800 d3dx9_36: Add some traces. --- dlls/d3dx9_36/math.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c278d7ec3ee7394a918e…

1 0