September 2012 - Wine-commits

Matteo Bruni : d3dcompiler: Parse struct dereferences.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 6b2ecb509abeb53ed552da14161c694afd9284ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2ecb509abeb53ed552da141… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 28 17:22:39 2012 +0200 d3dcompiler: Parse struct dereferences. --- dlls/d3dcompiler_43/hlsl.y | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index d302fa1..e795962 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1795,7 +1795,36 @@ postfix_expr: primary_expr struct source_location loc; set_location(&loc, &@2); - if ($1->data_type->type <= HLSL_CLASS_LAST_NUMERIC) + if ($1->data_type->type == HLSL_CLASS_STRUCT) + { + struct hlsl_type *type = $1->data_type; + struct hlsl_struct_field *field; + + $$ = NULL; + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + if (!strcmp($3, field->name)) + { + struct hlsl_ir_deref *deref = new_record_deref($1, field); + + if (!deref) + { + ERR("Out of memory\n"); + return -1; + } + deref->node.loc = loc; + $$ = &deref->node; + break; + } + } + if (!$$) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "invalid subscript %s", debugstr_a($3)); + return 1; + } + } + else if ($1->data_type->type <= HLSL_CLASS_LAST_NUMERIC) { struct hlsl_ir_swizzle *swizzle;

1 0

Matteo Bruni : d3dcompiler: Parse struct typedefs.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: f50007b856b29d9f106f710313499fef68ba7e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50007b856b29d9f106f71031… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 28 17:22:40 2012 +0200 d3dcompiler: Parse struct typedefs. --- dlls/d3dcompiler_43/hlsl.y | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index e795962..d8c82a9 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1373,6 +1373,14 @@ typedef: KW_TYPEDEF var_modifiers type type_specs ';' if (!add_typedef($2, $3, $4, &loc)) return 1; } + | KW_TYPEDEF struct_spec type_specs ';' + { + struct source_location loc; + + set_location(&loc, &@1); + if (!add_typedef(0, $2, $3, &loc)) + return 1; + } type_specs: type_spec {

1 0

Matteo Bruni : d3dcompiler: Parse array indexing expressions.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: b1594dabcc4e01370448730b7ab326446cfed727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1594dabcc4e01370448730b7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 28 17:22:41 2012 +0200 d3dcompiler: Parse array indexing expressions. --- dlls/d3dcompiler_43/hlsl.y | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index d8c82a9..8627e54 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1852,6 +1852,64 @@ postfix_expr: primary_expr return 1; } } + | postfix_expr '[' expr ']' + { + /* This may be an array dereference or a vector/matrix + * subcomponent access. + * We store it as an array dereference in any case. */ + struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); + struct hlsl_type *expr_type = $1->data_type; + struct source_location loc; + + TRACE("Array dereference from type %s\n", debug_hlsl_type(expr_type)); + if (!deref) + { + ERR("Out of memory\n"); + return -1; + } + deref->node.type = HLSL_IR_DEREF; + set_location(&loc, &@2); + deref->node.loc = loc; + if (expr_type->type == HLSL_CLASS_ARRAY) + { + deref->node.data_type = expr_type->e.array.type; + } + else if (expr_type->type == HLSL_CLASS_MATRIX) + { + deref->node.data_type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, expr_type->base_type, expr_type->dimx, 1); + } + else if (expr_type->type == HLSL_CLASS_VECTOR) + { + deref->node.data_type = new_hlsl_type(NULL, HLSL_CLASS_SCALAR, expr_type->base_type, 1, 1); + } + else + { + if (expr_type->type == HLSL_CLASS_SCALAR) + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "array-indexed expression is scalar"); + else + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "expression is not array-indexable"); + d3dcompiler_free(deref); + free_instr($1); + free_instr($3); + return 1; + } + if ($3->data_type->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "array index is not scalar"); + d3dcompiler_free(deref); + free_instr($1); + free_instr($3); + return 1; + } + deref->type = HLSL_IR_DEREF_ARRAY; + deref->v.array.array = $1; + deref->v.array.index = $3; + + $$ = &deref->node; + } /* "var_modifiers" doesn't make sense in this case, but it's needed in the grammar to avoid shift/reduce conflicts. */ | var_modifiers type '(' initializer_expr_list ')'

1 0

Christian Costa : ntoskrnl.exe: Improve IoAllocateMdl stub.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 2a278ef5e4e49e0aaa23c21873cf9f1c2865dd59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a278ef5e4e49e0aaa23c2187… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Sep 27 23:12:28 2012 +0200 ntoskrnl.exe: Improve IoAllocateMdl stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 285541a..afcca48 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -396,8 +396,15 @@ PVOID WINAPI IoAllocateErrorLogEntry( PVOID IoObject, UCHAR EntrySize ) */ PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN SecondaryBuffer, BOOLEAN ChargeQuota, PIRP Irp ) { - FIXME( "stub: %p, %u, %i, %i, %p\n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp ); - return NULL; + PMDL mdl; + + FIXME("partial stub: %p, %u, %i, %i, %p\n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp); + + mdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MDL)); + if (!mdl) + return NULL; + + return mdl; }

1 0

Christian Costa : ntoskrnl.exe: Add partial stub for IoFreeMdl.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 5087cb192c7c54bf74d600a8a1f279456a65eba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5087cb192c7c54bf74d600a8a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Sep 27 23:12:36 2012 +0200 ntoskrnl.exe: Add partial stub for IoFreeMdl. --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index afcca48..842ade2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -409,6 +409,17 @@ PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN Secondary /*********************************************************************** + * IoFreeMdl (NTOSKRNL.EXE.@) + */ +VOID WINAPI IoFreeMdl(PMDL mdl) +{ + FIXME("partial stub: %p\n", mdl); + + HeapFree(GetProcessHeap(), 0, mdl); +} + + +/*********************************************************************** * IoAllocateWorkItem (NTOSKRNL.EXE.@) */ PIO_WORKITEM WINAPI IoAllocateWorkItem( PDEVICE_OBJECT DeviceObject ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 97a71fc..f452238 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -371,7 +371,7 @@ @ stub IoFreeController @ stub IoFreeErrorLogEntry @ stdcall IoFreeIrp(ptr) -@ stub IoFreeMdl +@ stdcall IoFreeMdl(ptr) @ stub IoFreeWorkItem @ stub IoGetAttachedDevice @ stub IoGetAttachedDeviceReference

1 0

Henri Verbeet : winex11: Fullscreen windows are never maximized.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 47c54c4ae7f235780a55ddf670503db4afc11055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c54c4ae7f235780a55ddf67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 28 01:06:52 2012 +0200 winex11: Fullscreen windows are never maximized. Some window managers incorrectly set maximized state on fullscreen windows. --- dlls/winex11.drv/event.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 514f0d4..d9c932e 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -998,6 +998,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) HWND parent; BOOL root_coords; int cx, cy, x = event->x, y = event->y; + DWORD style; if (!hwnd) return; if (!(data = get_win_data( hwnd ))) return; @@ -1061,9 +1062,10 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) hwnd, data->window_rect.right - data->window_rect.left, data->window_rect.bottom - data->window_rect.top, cx, cy ); - if (is_net_wm_state_maximized( event->display, data )) + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + if ((style & WS_CAPTION) == WS_CAPTION && is_net_wm_state_maximized( event->display, data )) { - if (!IsZoomed( data->hwnd )) + if (!(style & WS_MAXIMIZE)) { TRACE( "win %p/%lx is maximized\n", data->hwnd, data->whole_window ); release_win_data( data ); @@ -1073,7 +1075,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) } else { - if (IsZoomed( data->hwnd )) + if (style & WS_MAXIMIZE) { TRACE( "window %p/%lx is no longer maximized\n", data->hwnd, data->whole_window ); release_win_data( data ); @@ -1198,7 +1200,7 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat if (data->iconic && data->wm_state == NormalState) /* restore window */ { data->iconic = FALSE; - if (is_net_wm_state_maximized( event->display, data )) + if ((style & WS_CAPTION) == WS_CAPTION && is_net_wm_state_maximized( event->display, data )) { if ((style & WS_MAXIMIZEBOX) && !(style & WS_DISABLED)) {

1 0

Henri Verbeet : winex11: Handle a NULL cursor clipping rect the same as a fullscreen rect.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 73d68c5a31b972a24dab39b036a5d3197edb3565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d68c5a31b972a24dab39b03… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 28 01:06:53 2012 +0200 winex11: Handle a NULL cursor clipping rect the same as a fullscreen rect. We want to avoid ungrabbing the clipping window if "fullscreen clipping" is enabled. --- dlls/winex11.drv/mouse.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index be822bf..818bdd5 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1265,11 +1265,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) */ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) { - if (!clip) - { - ungrab_clipping_window(); - return TRUE; - } + if (!clip) clip = &virtual_screen_rect; if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) return TRUE; /* don't clip in the desktop process */

1 0

Henri Verbeet : winex11: Use the first active CRTC as primary if no primary is explicitly set.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 3ac14606aec47daaec0d838d861d560b4de026ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac14606aec47daaec0d838d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 28 01:06:54 2012 +0200 winex11: Use the first active CRTC as primary if no primary is explicitly set. --- dlls/winex11.drv/xrandr.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 968ff76..1093541 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -57,6 +57,7 @@ MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRSetCrtcConfig) static typeof(XRRGetScreenResources) *pXRRGetScreenResourcesCurrent; static RRMode *xrandr12_modes; +static int primary_crtc; #endif #undef MAKE_FUNCPTR @@ -273,14 +274,15 @@ static int xrandr12_get_current_mode(void) return 0; } - if (!resources->ncrtc || !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[0] ))) + if (resources->ncrtc <= primary_crtc || + !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[primary_crtc] ))) { pXRRFreeScreenResources( resources ); ERR("Failed to get CRTC info.\n"); return 0; } - TRACE("CRTC 0: mode %#lx, %ux%u+%d+%d.\n", crtc_info->mode, + TRACE("CRTC %d: mode %#lx, %ux%u+%d+%d.\n", primary_crtc, crtc_info->mode, crtc_info->width, crtc_info->height, crtc_info->x, crtc_info->y); for (i = 0; i < xrandr_mode_count; ++i) @@ -318,18 +320,20 @@ static LONG xrandr12_set_current_mode( int mode ) return DISP_CHANGE_FAILED; } - if (!resources->ncrtc || !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[0] ))) + if (resources->ncrtc <= primary_crtc || + !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[primary_crtc] ))) { pXRRFreeScreenResources( resources ); ERR("Failed to get CRTC info.\n"); return DISP_CHANGE_FAILED; } - TRACE("CRTC 0: mode %#lx, %ux%u+%d+%d.\n", crtc_info->mode, + TRACE("CRTC %d: mode %#lx, %ux%u+%d+%d.\n", primary_crtc, crtc_info->mode, crtc_info->width, crtc_info->height, crtc_info->x, crtc_info->y); - status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[0], CurrentTime, crtc_info->x, - crtc_info->y, xrandr12_modes[mode], crtc_info->rotation, crtc_info->outputs, crtc_info->noutput ); + status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[primary_crtc], + CurrentTime, crtc_info->x, crtc_info->y, xrandr12_modes[mode], + crtc_info->rotation, crtc_info->outputs, crtc_info->noutput ); pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources ); @@ -344,6 +348,27 @@ static LONG xrandr12_set_current_mode( int mode ) return DISP_CHANGE_SUCCESSFUL; } +static XRRCrtcInfo *xrandr12_get_primary_crtc_info( XRRScreenResources *resources, int *crtc_idx ) +{ + XRRCrtcInfo *crtc_info; + int i; + + for (i = 0; i < resources->ncrtc; ++i) + { + crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[i] ); + if (!crtc_info || crtc_info->mode == None) + { + pXRRFreeCrtcInfo( crtc_info ); + continue; + } + + *crtc_idx = i; + return crtc_info; + } + + return NULL; +} + static int xrandr12_init_modes(void) { XRRScreenResources *resources; @@ -368,14 +393,14 @@ static int xrandr12_init_modes(void) } } - if (!resources->ncrtc || !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[0] ))) + if (!(crtc_info = xrandr12_get_primary_crtc_info( resources, &primary_crtc ))) { pXRRFreeScreenResources( resources ); - ERR("Failed to get CRTC info.\n"); + ERR("Failed to get primary CRTC info.\n"); return ret; } - TRACE("CRTC 0: mode %#lx, %ux%u+%d+%d.\n", crtc_info->mode, + TRACE("CRTC %d: mode %#lx, %ux%u+%d+%d.\n", primary_crtc, crtc_info->mode, crtc_info->width, crtc_info->height, crtc_info->x, crtc_info->y); if (!crtc_info->noutput || !(output_info = pXRRGetOutputInfo( gdi_display, resources, crtc_info->outputs[0] )))

1 0

Henri Verbeet : wined3d: Unify GLSL input / output variable naming.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: aa9daa285e7a7caefcf9e03911cb9a0b6c4d0a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9daa285e7a7caefcf9e0391… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 28 01:06:55 2012 +0200 wined3d: Unify GLSL input / output variable naming. --- dlls/wined3d/glsl_shader.c | 90 ++++++++++++++++++++++--------------------- 1 files changed, 46 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa9daa285e7a7caefcf9e…

1 0

Henri Verbeet : wined3d: Set more accurate limits for SM4 shaders.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: e13a589bfcade4dd50a6eadc09e6501349ecba0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13a589bfcade4dd50a6eadc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 28 01:06:56 2012 +0200 wined3d: Set more accurate limits for SM4 shaders. --- dlls/wined3d/glsl_shader.c | 6 ++-- dlls/wined3d/shader.c | 64 +++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 8 ++-- 3 files changed, 63 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6efa7fc..db04c6a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -997,7 +997,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (!pshader) { shader_addline(buffer, "uniform vec4 posFixup;\n"); - shader_addline(buffer, "void order_ps_input(in vec4[%u]);\n", MAX_REG_OUTPUT); + shader_addline(buffer, "void order_ps_input(in vec4[%u]);\n", shader->limits.packed_output); } else { @@ -3997,7 +3997,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer if (ps_major < 3) { - shader_addline(buffer, "void order_ps_input(in vec4 vs_out[%u])\n{\n", MAX_REG_OUTPUT); + shader_addline(buffer, "void order_ps_input(in vec4 vs_out[%u])\n{\n", vs->limits.packed_output); for (i = 0; map; map >>= 1, ++i) { @@ -4053,7 +4053,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer UINT in_count = min(vec4_varyings(ps_major, gl_info), ps->limits.packed_input); /* This one is tricky: a 3.0 pixel shader reads from a 3.0 vertex shader */ shader_addline(buffer, "varying vec4 ps_in[%u];\n", in_count); - shader_addline(buffer, "void order_ps_input(in vec4 vs_out[%u])\n{\n", MAX_REG_OUTPUT); + shader_addline(buffer, "void order_ps_input(in vec4 vs_out[%u])\n{\n", vs->limits.packed_output); /* First, sort out position and point size. Those are not passed to the pixel shader */ for (i = 0; map; map >>= 1, ++i) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index bcff6b1..72f2fa6 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1779,10 +1779,6 @@ static void vertexshader_set_limits(struct wined3d_shader *shader) shader->limits.constant_float = min(256, device->d3d_vshader_constantF); break; - case WINED3D_SHADER_VERSION(4, 0): - FIXME("Using 3.0 limits for 4.0 shader.\n"); - /* Fall through. */ - case WINED3D_SHADER_VERSION(3, 0): shader->limits.temporary = 32; shader->limits.constant_bool = 32; @@ -1799,6 +1795,19 @@ static void vertexshader_set_limits(struct wined3d_shader *shader) shader->limits.constant_float = min(256, device->d3d_vshader_constantF); break; + case WINED3D_SHADER_VERSION(4, 0): + shader->limits.temporary = 32; /* FIXME: 4096 */ + shader->limits.sampler = 16; /* FIXME: 128 resources, 16 sampler states */ + shader->limits.constant_int = 0; + shader->limits.constant_float = 0; + shader->limits.constant_bool = 0; + shader->limits.address = 1; + shader->limits.packed_output = 16; + shader->limits.packed_input = 0; + shader->limits.attributes = 16; + shader->limits.label = 16; + break; + default: shader->limits.temporary = 12; shader->limits.constant_bool = 16; @@ -1864,6 +1873,35 @@ static HRESULT vertexshader_init(struct wined3d_shader *shader, struct wined3d_d return WINED3D_OK; } +static void geometryshader_set_limits(struct wined3d_shader *shader) +{ + DWORD shader_version = WINED3D_SHADER_VERSION(shader->reg_maps.shader_version.major, + shader->reg_maps.shader_version.minor); + + switch (shader_version) + { + case WINED3D_SHADER_VERSION(4, 0): + shader->limits.temporary = 32; /* FIXME: 4096 */ + shader->limits.texcoord = 0; + shader->limits.sampler = 16; /* FIXME: 128 resources, 16 sampler states */ + shader->limits.constant_int = 0; + shader->limits.constant_float = 0; + shader->limits.constant_bool = 0; + shader->limits.address = 1; + shader->limits.packed_output = 32; + shader->limits.packed_input = 16; + shader->limits.attributes = 0; + shader->limits.label = 16; + break; + + default: + memset(&shader->limits, 0, sizeof(shader->limits)); + FIXME("Unhandled geometry shader version \"%u.%u\".\n", + shader->reg_maps.shader_version.major, + shader->reg_maps.shader_version.minor); + } +} + static HRESULT geometryshader_init(struct wined3d_shader *shader, struct wined3d_device *device, const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, void *parent, const struct wined3d_parent_ops *parent_ops, unsigned int max_version) @@ -1880,6 +1918,8 @@ static HRESULT geometryshader_init(struct wined3d_shader *shader, struct wined3d return hr; } + geometryshader_set_limits(shader); + shader->load_local_constsF = FALSE; return WINED3D_OK; @@ -2092,10 +2132,6 @@ static void pixelshader_set_limits(struct wined3d_shader *shader) shader->limits.label = 16; break; - case WINED3D_SHADER_VERSION(4, 0): - FIXME("Using 3.0 limits for 4.0 shader.\n"); - /* Fall through. */ - case WINED3D_SHADER_VERSION(3, 0): shader->limits.temporary = 32; shader->limits.constant_float = 224; @@ -2107,6 +2143,18 @@ static void pixelshader_set_limits(struct wined3d_shader *shader) shader->limits.label = 16; /* FIXME: 2048 */ break; + case WINED3D_SHADER_VERSION(4, 0): + shader->limits.temporary = 32; /* FIXME: 4096 */ + shader->limits.texcoord = 0; + shader->limits.sampler = 16; /* FIXME: 128 resources, 16 sampler states */ + shader->limits.constant_int = 0; + shader->limits.constant_float = 0; + shader->limits.constant_bool = 0; + shader->limits.address = 1; + shader->limits.packed_input = 32; + shader->limits.label = 16; + break; + default: shader->limits.temporary = 32; shader->limits.constant_float = 32; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 258ac2d..b5fd4f0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -404,8 +404,8 @@ enum wined3d_shader_rel_op #define MAX_REG_ADDR 1 #define MAX_REG_TEMP 32 #define MAX_REG_TEXCRD 8 -#define MAX_REG_INPUT 12 -#define MAX_REG_OUTPUT 12 +#define MAX_REG_INPUT 32 +#define MAX_REG_OUTPUT 32 #define MAX_CONST_I 16 #define MAX_CONST_B 16 @@ -563,8 +563,8 @@ struct wined3d_shader_reg_maps DWORD temporary; /* MAX_REG_TEMP, 32 */ DWORD *constf; /* pixel, vertex */ DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ - WORD input_registers; /* max(MAX_REG_INPUT, MAX_ATTRIBS), 16 */ - WORD output_registers; /* MAX_REG_OUTPUT, 12 */ + DWORD input_registers; /* max(MAX_REG_INPUT, MAX_ATTRIBS), 32 */ + DWORD output_registers; /* MAX_REG_OUTPUT, 32 */ WORD integer_constants; /* MAX_CONST_I, 16 */ WORD boolean_constants; /* MAX_CONST_B, 16 */ WORD local_int_consts; /* MAX_CONST_I, 16 */

1 0