October 2009 - Wine-Commits

Jörg Höhle : mciwave: Do not lie about state when winmm fails in Pause or Resume.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 3c6496d7b5ec76a722c9f2d7bf3d965d15461c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6496d7b5ec76a722c9f2d7b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 17 21:30:33 2009 +0200 mciwave: Do not lie about state when winmm fails in Pause or Resume. --- dlls/mciwave/mciwave.c | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index a0415bd..664cc44 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1134,20 +1134,28 @@ static DWORD WAVE_mciPause(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARM switch (wmw->dwStatus) { case MCI_MODE_PLAY: - wmw->dwStatus = MCI_MODE_PAUSE; dwRet = waveOutPause(wmw->hWave); + if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_PAUSE; + else { /* When playthread was not started yet, winmm not opened, error 5 MMSYSERR_INVALHANDLE */ + ERR("waveOutPause error %d\n",dwRet); + dwRet = MCIERR_INTERNAL; + } break; case MCI_MODE_RECORD: - wmw->dwStatus = MCI_MODE_PAUSE; dwRet = waveInStop(wmw->hWave); + if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_PAUSE; + else { + ERR("waveInStop error %d\n",dwRet); + dwRet = MCIERR_INTERNAL; + } break; case MCI_MODE_PAUSE: dwRet = MMSYSERR_NOERROR; break; default: - return MCIERR_NONAPPLICABLE_FUNCTION; + dwRet = MCIERR_NONAPPLICABLE_FUNCTION; } - return (dwRet == MMSYSERR_NOERROR) ? 0 : MCIERR_INTERNAL; + return dwRet; } /************************************************************************** @@ -1164,12 +1172,21 @@ static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PAR switch (wmw->dwStatus) { case MCI_MODE_PAUSE: + /* Only update dwStatus if wave* succeeds and will exchange buffers buffers. */ if (wmw->fInput) { - wmw->dwStatus = MCI_MODE_RECORD; dwRet = waveInStart(wmw->hWave); + if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_RECORD; + else { + ERR("waveInStart error %d\n",dwRet); + dwRet = MCIERR_INTERNAL; + } } else { - wmw->dwStatus = MCI_MODE_PLAY; dwRet = waveOutRestart(wmw->hWave); + if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_PLAY; + else { + ERR("waveOutRestart error %d\n",dwRet); + dwRet = MCIERR_INTERNAL; + } } break; case MCI_MODE_PLAY: @@ -1177,9 +1194,9 @@ static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PAR dwRet = MMSYSERR_NOERROR; break; default: - return MCIERR_NONAPPLICABLE_FUNCTION; + dwRet = MCIERR_NONAPPLICABLE_FUNCTION; } - return (dwRet == MMSYSERR_NOERROR) ? 0 : MCIERR_INTERNAL; + return dwRet; } /**************************************************************************

1 0

Rico Schüller : d3d10: Parse local_variables.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: b55641f14a210f689cde8b08750a78779657c06e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55641f14a210f689cde8b087… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 25 17:11:49 2009 +0100 d3d10: Parse local_variables. --- dlls/d3d10/d3d10_private.h | 3 +- dlls/d3d10/effect.c | 120 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 120 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index ebc4db1..f077115 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -154,7 +154,7 @@ struct d3d10_effect DWORD version; DWORD local_buffer_count; DWORD variable_count; - DWORD object_count; + DWORD local_variable_count; DWORD sharedbuffers_count; DWORD sharedobjects_count; DWORD technique_count; @@ -171,6 +171,7 @@ struct d3d10_effect struct wine_rb_tree types; struct d3d10_effect_variable *local_buffers; + struct d3d10_effect_variable *local_variables; struct d3d10_effect_technique *techniques; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 08c6f05..def2c1a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -967,6 +967,95 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * return S_OK; } +static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const char **ptr, const char *data) +{ + unsigned int i; + HRESULT hr; + + hr = parse_fx10_variable_head(v, ptr, data); + if (FAILED(hr)) return hr; + + skip_dword_unknown(ptr, 2); + + switch (v->type->basetype) + { + case D3D10_SVT_TEXTURE1D: + case D3D10_SVT_TEXTURE1DARRAY: + case D3D10_SVT_TEXTURE2D: + case D3D10_SVT_TEXTURE2DARRAY: + case D3D10_SVT_TEXTURE2DMS: + case D3D10_SVT_TEXTURE2DMSARRAY: + case D3D10_SVT_TEXTURE3D: + case D3D10_SVT_TEXTURECUBE: + case D3D10_SVT_RENDERTARGETVIEW: + case D3D10_SVT_DEPTHSTENCILVIEW: + TRACE("SVT could not have elements.\n"); + break; + + case D3D10_SVT_VERTEXSHADER: + case D3D10_SVT_PIXELSHADER: + case D3D10_SVT_GEOMETRYSHADER: + TRACE("SVT is a shader.\n"); + for (i = 0; i < max(v->type->element_count, 1); ++i) + { + DWORD shader_offset; + + /* + * TODO: Parse the shader + */ + read_dword(ptr, &shader_offset); + FIXME("Shader offset: %#x.\n", shader_offset); + } + break; + + case D3D10_SVT_DEPTHSTENCIL: + case D3D10_SVT_BLEND: + case D3D10_SVT_RASTERIZER: + case D3D10_SVT_SAMPLER: + TRACE("SVT is a state.\n"); + for (i = 0; i < max(v->type->element_count, 1); ++i) + { + unsigned int j; + DWORD object_count; + + read_dword(ptr, &object_count); + TRACE("Object count: %#x.\n", object_count); + + for (j = 0; j < object_count; ++j) + { + skip_dword_unknown(ptr, 4); + } + } + break; + + default: + FIXME("Unhandled case %s.\n", debug_d3d10_shader_variable_type(v->type->basetype)); + return E_FAIL; + } + + read_dword(ptr, &v->annotation_count); + TRACE("Variable has %u annotations.\n", v->annotation_count); + + v->annotations = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, v->annotation_count * sizeof(*v->annotations)); + if (!v->annotations) + { + ERR("Failed to allocate variable annotations memory.\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < v->annotation_count; ++i) + { + struct d3d10_effect_variable *a = &v->annotations[i]; + + a->effect = v->effect; + + hr = parse_fx10_annotation(a, ptr, data); + if (FAILED(hr)) return hr; + } + + return S_OK; +} + static HRESULT parse_fx10_local_buffer(struct d3d10_effect_variable *l, const char **ptr, const char *data) { unsigned int i; @@ -1188,6 +1277,13 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d return E_OUTOFMEMORY; } + e->local_variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->local_variable_count * sizeof(*e->local_variables)); + if (!e->local_variables) + { + ERR("Failed to allocate local variable memory.\n"); + return E_OUTOFMEMORY; + } + e->techniques = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->technique_count * sizeof(*e->techniques)); if (!e->techniques) { @@ -1206,6 +1302,17 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d if (FAILED(hr)) return hr; } + for (i = 0; i < e->local_variable_count; ++i) + { + struct d3d10_effect_variable *v = &e->local_variables[i]; + + v->effect = e; + v->vtbl = &d3d10_effect_variable_vtbl; + + hr = parse_fx10_local_variable(v, &ptr, data); + if (FAILED(hr)) return hr; + } + for (i = 0; i < e->technique_count; ++i) { struct d3d10_effect_technique *t = &e->techniques[i]; @@ -1235,8 +1342,8 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->variable_count); TRACE("Variable count: %u\n", e->variable_count); - read_dword(&ptr, &e->object_count); - TRACE("Object count: %u\n", e->object_count); + read_dword(&ptr, &e->local_variable_count); + TRACE("Object count: %u\n", e->local_variable_count); read_dword(&ptr, &e->sharedbuffers_count); TRACE("Sharedbuffers count: %u\n", e->sharedbuffers_count); @@ -1533,6 +1640,15 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) HeapFree(GetProcessHeap(), 0, This->techniques); } + if (This->local_variables) + { + for (i = 0; i < This->local_variable_count; ++i) + { + d3d10_effect_variable_destroy(&This->local_variables[i]); + } + HeapFree(GetProcessHeap(), 0, &This->local_variables); + } + if (This->local_buffers) { for (i = 0; i < This->local_buffer_count; ++i)

1 0

Rico Schüller : d3d10: Add matrix column major parsing .
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 22d8fc081ae90e6f7507e2e066fdec453378331f URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d8fc081ae90e6f7507e2e06… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 25 17:11:42 2009 +0100 d3d10: Add matrix column major parsing. --- dlls/d3d10/effect.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 0d1eab0..2a0dfb7 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); #define D3D10_FX10_TYPE_CLASS_SHIFT 0 #define D3D10_FX10_TYPE_CLASS_MASK (0x7 << D3D10_FX10_TYPE_CLASS_SHIFT) +#define D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK 0x4000 + static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl; static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl; static const struct ID3D10EffectVariableVtbl d3d10_effect_variable_vtbl; @@ -286,13 +288,14 @@ static HRESULT parse_shader(struct d3d10_effect_object *o, const char *data) return parse_dxbc(ptr, dxbc_size, shader_chunk_handler, s); } -static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c) +static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c, BOOL is_column_major) { switch (c) { case 1: return D3D10_SVC_SCALAR; case 2: return D3D10_SVC_VECTOR; - case 3: return D3D10_SVC_MATRIX_ROWS; + case 3: if (is_column_major) return D3D10_SVC_MATRIX_COLUMNS; + else return D3D10_SVC_MATRIX_ROWS; default: FIXME("Unknown variable class %#x.\n", c); return 0; @@ -385,7 +388,7 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con t->column_count = (tmp & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; t->row_count = (tmp & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; t->basetype = d3d10_variable_type((tmp & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE); - t->type_class = d3d10_variable_class((tmp & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT); + t->type_class = d3d10_variable_class((tmp & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT, tmp & D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK); TRACE("Type description: %#x.\n", tmp); TRACE("\tcolumns: %u.\n", t->column_count); @@ -393,7 +396,7 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); TRACE("\tunknown bits: %#x.\n", tmp & ~(D3D10_FX10_TYPE_COLUMN_MASK | D3D10_FX10_TYPE_ROW_MASK - | D3D10_FX10_TYPE_BASETYPE_MASK | D3D10_FX10_TYPE_CLASS_MASK)); + | D3D10_FX10_TYPE_BASETYPE_MASK | D3D10_FX10_TYPE_CLASS_MASK | D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK)); } else if (unknown0 == 3) {

1 0

Jörg Höhle : mciwave: Pause/ resume is not accepted from every state.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: bf4665780cf067fe8a014cf00b1353a65f1e278d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4665780cf067fe8a014cf00… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 17 16:37:40 2009 +0200 mciwave: Pause/resume is not accepted from every state. --- dlls/mciwave/mciwave.c | 42 ++++++++++++++++++++++++++++++------------ 1 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 8eb6bad..a0415bd 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1130,16 +1130,23 @@ static DWORD WAVE_mciPause(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARM TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; - if (wmw->dwStatus == MCI_MODE_PLAY) { + switch (wmw->dwStatus) { + case MCI_MODE_PLAY: wmw->dwStatus = MCI_MODE_PAUSE; + dwRet = waveOutPause(wmw->hWave); + break; + case MCI_MODE_RECORD: + wmw->dwStatus = MCI_MODE_PAUSE; + dwRet = waveInStop(wmw->hWave); + break; + case MCI_MODE_PAUSE: + dwRet = MMSYSERR_NOERROR; + break; + default: + return MCIERR_NONAPPLICABLE_FUNCTION; } - - if (wmw->fInput) dwRet = waveInStop(wmw->hWave); - else dwRet = waveOutPause(wmw->hWave); - return (dwRet == MMSYSERR_NOERROR) ? 0 : MCIERR_INTERNAL; } @@ -1149,18 +1156,29 @@ static DWORD WAVE_mciPause(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARM static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); - DWORD dwRet = 0; + DWORD dwRet; TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; - if (wmw->dwStatus == MCI_MODE_PAUSE) { - wmw->dwStatus = MCI_MODE_PLAY; + switch (wmw->dwStatus) { + case MCI_MODE_PAUSE: + if (wmw->fInput) { + wmw->dwStatus = MCI_MODE_RECORD; + dwRet = waveInStart(wmw->hWave); + } else { + wmw->dwStatus = MCI_MODE_PLAY; + dwRet = waveOutRestart(wmw->hWave); + } + break; + case MCI_MODE_PLAY: + case MCI_MODE_RECORD: + dwRet = MMSYSERR_NOERROR; + break; + default: + return MCIERR_NONAPPLICABLE_FUNCTION; } - - if (wmw->fInput) dwRet = waveInStart(wmw->hWave); - else dwRet = waveOutRestart(wmw->hWave); return (dwRet == MMSYSERR_NOERROR) ? 0 : MCIERR_INTERNAL; }

1 0

Stefan Dösinger : wined3d: Remove dead code.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 9ee65081324e54f479f6c30a1c2452b139c01416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee65081324e54f479f6c30a1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 7 22:20:52 2009 +0200 wined3d: Remove dead code. --- dlls/wined3d/arb_program_shader.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2a618df..9b1d06a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -84,12 +84,6 @@ static inline BOOL ffp_clip_emul(IWineD3DStateBlockImpl *stateblock) return stateblock->lowest_disabled_stage < 7; } -/* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vs_arb_constantsF) - 1, - * so upload them above that - */ -#define ARB_SHADER_PRIVCONST_BASE (GL_LIMITS(vs_arb_constantsF) - 1) -#define ARB_SHADER_PRIVCONST_POS ARB_SHADER_PRIVCONST_BASE + 0 - /* ARB_program_shader private data */ struct control_frame

1 0

Stefan Dösinger : wined3d: Use the native constant limit for fitting private constants.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 0c72464abf2af8c166c5bc618d4faeb9215e7b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c72464abf2af8c166c5bc618… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 24 18:17:22 2009 -0700 wined3d: Use the native constant limit for fitting private constants. --- dlls/wined3d/arb_program_shader.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9b1d06a..abbdf41 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -629,13 +629,13 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s */ if (pshader) { - max_constantsF = gl_info->max_ps_arb_constantsF; + max_constantsF = gl_info->max_ps_arb_native_constants; } else { if(This->baseShader.reg_maps.usesrelconstF) { DWORD highest_constf = 0, clip_limit; - max_constantsF = gl_info->max_vs_arb_constantsF - reserved_vs_const(iface, gl_info); + max_constantsF = gl_info->max_vs_arb_native_constants - reserved_vs_const(iface, gl_info); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); for(i = 0; i < This->baseShader.limits.constant_float; i++) @@ -665,7 +665,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s { if (ctx->target_version >= NV2) *num_clipplanes = gl_info->max_clipplanes; else *num_clipplanes = min(gl_info->max_clipplanes, 4); - max_constantsF = gl_info->max_vs_arb_constantsF; + max_constantsF = gl_info->max_vs_arb_native_constants; } } @@ -698,6 +698,21 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s } } + /* After subtracting privately used constants from the hardware limit(they are loaded as + * local constants), make sure the shader doesn't violate the env constant limit + */ + if(pshader) + { + max_constantsF = min(max_constantsF, gl_info->max_ps_arb_constantsF); + } + else + { + max_constantsF = min(max_constantsF, gl_info->max_vs_arb_constantsF); + } + + /* Avoid declaring more constants than needed */ + max_constantsF = min(max_constantsF, This->baseShader.limits.constant_float); + /* we use the array-based constants array if the local constants are marked for loading, * because then we use indirect addressing, or when the local constant list is empty, * because then we don't know if we're using indirect addressing or not. If we're hardcoding

1 0

Rico Schüller : d3d10: Improve d3d10_variable_type().
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 0da0fa7e4d604b99791ae2857d2a476daa461347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da0fa7e4d604b99791ae2857… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 25 17:11:34 2009 +0100 d3d10: Improve d3d10_variable_type(). --- dlls/d3d10/effect.c | 52 +++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index af78987..0d1eab0 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -299,17 +299,49 @@ static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c) } } -static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t) +static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) { - switch (t) + if(is_object) { - case 1: return D3D10_SVT_FLOAT; - case 2: return D3D10_SVT_INT; - case 3: return D3D10_SVT_UINT; - case 4: return D3D10_SVT_BOOL; - default: - FIXME("Unknown variable type %#x.\n", t); - return 0; + switch (t) + { + case 1: return D3D10_SVT_STRING; + case 2: return D3D10_SVT_BLEND; + case 3: return D3D10_SVT_DEPTHSTENCIL; + case 4: return D3D10_SVT_RASTERIZER; + case 5: return D3D10_SVT_PIXELSHADER; + case 6: return D3D10_SVT_VERTEXSHADER; + case 7: return D3D10_SVT_GEOMETRYSHADER; + + case 10: return D3D10_SVT_TEXTURE1D; + case 11: return D3D10_SVT_TEXTURE1DARRAY; + case 12: return D3D10_SVT_TEXTURE2D; + case 13: return D3D10_SVT_TEXTURE2DARRAY; + case 14: return D3D10_SVT_TEXTURE2DMS; + case 15: return D3D10_SVT_TEXTURE2DMSARRAY; + case 16: return D3D10_SVT_TEXTURE3D; + case 17: return D3D10_SVT_TEXTURECUBE; + + case 19: return D3D10_SVT_RENDERTARGETVIEW; + case 20: return D3D10_SVT_DEPTHSTENCILVIEW; + case 21: return D3D10_SVT_SAMPLER; + default: + FIXME("Unknown variable type %#x.\n", t); + return 0; + } + } + else + { + switch (t) + { + case 1: return D3D10_SVT_FLOAT; + case 2: return D3D10_SVT_INT; + case 3: return D3D10_SVT_UINT; + case 4: return D3D10_SVT_BOOL; + default: + FIXME("Unknown variable type %#x.\n", t); + return 0; + } } } @@ -352,7 +384,7 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con read_dword(&ptr, &tmp); t->column_count = (tmp & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; t->row_count = (tmp & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; - t->basetype = d3d10_variable_type((tmp & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT); + t->basetype = d3d10_variable_type((tmp & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE); t->type_class = d3d10_variable_class((tmp & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT); TRACE("Type description: %#x.\n", tmp);

1 0

Stefan Dösinger : wined3d: Take native constants into account when reporting ARB limits.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: f15fc8f41c71dbca404decae7c75da58286e59bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15fc8f41c71dbca404decae7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 24 18:09:52 2009 -0700 wined3d: Take native constants into account when reporting ARB limits. --- dlls/wined3d/arb_program_shader.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 855c368..2a618df 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4519,6 +4519,9 @@ static BOOL shader_arb_dirty_const(IWineD3DDevice *iface) { static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) { + DWORD vs_consts = min(gl_info->max_vs_arb_constantsF, gl_info->max_vs_arb_native_constants); + DWORD ps_consts = min(gl_info->max_ps_arb_constantsF, gl_info->max_ps_arb_native_constants); + /* We don't have an ARB fixed function pipeline yet, so let the none backend set its caps, * then overwrite the shader specific ones */ @@ -4530,7 +4533,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); TRACE_(d3d_caps)("Hardware vertex shader version 3.0 enabled (NV_VERTEX_PROGRAM3)\n"); } - else if (gl_info->max_vs_arb_constantsF >= 256) + else if (vs_consts >= 256) { /* Shader Model 2.0 requires at least 256 vertex shader constants */ pCaps->VertexShaderVersion = WINED3DVS_VERSION(2,0); @@ -4541,7 +4544,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1); TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); } - pCaps->MaxVertexShaderConst = gl_info->max_vs_arb_constantsF; + pCaps->MaxVertexShaderConst = vs_consts; } if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { @@ -4550,7 +4553,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0); TRACE_(d3d_caps)("Hardware pixel shader version 3.0 enabled (NV_FRAGMENT_PROGRAM2)\n"); } - else if (gl_info->max_ps_arb_constantsF >= 32) + else if (ps_consts >= 32) { /* Shader Model 2.0 requires at least 32 pixel shader constants */ pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0); @@ -4562,7 +4565,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); } pCaps->PixelShader1xMaxValue = 8.0f; - pCaps->MaxPixelShaderConst = gl_info->max_ps_arb_constantsF; + pCaps->MaxPixelShaderConst = ps_consts; } pCaps->VSClipping = use_nv_clip(gl_info);

1 0

Stefan Dösinger : wined3d: Get rid of the general shader constant limit.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: f9c4d442a9f9e5cde378c91775c711d82e6d5291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c4d442a9f9e5cde378c9177… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 24 18:05:42 2009 -0700 wined3d: Get rid of the general shader constant limit. --- dlls/wined3d/directx.c | 33 --------------------------------- 1 files changed, 0 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 06240e5..c145bf9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -408,34 +408,6 @@ static void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_se } } -/** Select the number of report maximum shader constants based on the selected shader modes */ -static void select_shader_max_constants(int ps_selected_mode, int vs_selected_mode, struct wined3d_gl_info *gl_info) -{ - switch (vs_selected_mode) { - case SHADER_GLSL: - gl_info->max_vshader_constantsF = gl_info->max_vs_glsl_constantsF; - break; - case SHADER_ARB: - gl_info->max_vshader_constantsF = gl_info->max_vs_arb_constantsF; - break; - default: - gl_info->max_vshader_constantsF = 0; - break; - } - - switch (ps_selected_mode) { - case SHADER_GLSL: - gl_info->max_pshader_constantsF = gl_info->max_ps_glsl_constantsF; - break; - case SHADER_ARB: - gl_info->max_pshader_constantsF = gl_info->max_ps_arb_constantsF; - break; - default: - gl_info->max_pshader_constantsF = 0; - break; - } -} - /********************************************************** * IWineD3D parts follows **********************************************************/ @@ -3780,10 +3752,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); - /* This function should *not* be modifying GL caps - * TODO: move the functionality where it belongs */ - select_shader_max_constants(ps_selected_mode, vs_selected_mode, &adapter->gl_info); - /* ------------------------------------------------ The following fields apply to both d3d8 and d3d9 ------------------------------------------------ */ @@ -4882,7 +4850,6 @@ BOOL InitAdapters(IWineD3DImpl *This) WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); - select_shader_max_constants(ps_selected_mode, vs_selected_mode, &adapter->gl_info); fillGLAttribFuncs(&adapter->gl_info); adapter->opengl = TRUE; }

1 0

Stefan Dösinger : wined3d: Use the shader backend reported constant limit outside the shader backend.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 70d6304a21d6c932ce02c55c6acd64940cc55979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d6304a21d6c932ce02c55c6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 24 16:23:34 2009 -0700 wined3d: Use the shader backend reported constant limit outside the shader backend. --- dlls/wined3d/context.c | 16 ++++++++-------- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/stateblock.c | 42 +++++++++++++++++++++--------------------- dlls/wined3d/vertexshader.c | 22 +++++++++++----------- 4 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70d6304a21d6c932ce02c…

1 0