wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Travis Athougies : d3dcompiler_43/tests: Added float vector tests to HLSL test suite.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 356420b3407200b53a7c15450daf3050b2f0b0be URL: http://source.winehq.org/git/wine.git/?a=commit;h=356420b3407200b53a7c15450… Author: Travis Athougies <iammisc(a)gmail.com> Date: Thu Oct 28 19:16:50 2010 -0700 d3dcompiler_43/tests: Added float vector tests to HLSL test suite. --- dlls/d3dcompiler_43/tests/hlsl.c | 62 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index aeb0d4d..ce214c0 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -434,6 +434,67 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * } } +static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, + IDirect3DVertexShader9 *vshader_passthru) +{ + static struct hlsl_probe_info vec4_indexing_test1_probes[] = + { + {0, 0, {0.020f, 0.245f, 0.351f, 1.000f}, 0.0001f, "vec4 indexing test 1 failed"} + }; + + static const char *vec4_indexing_test1_shader = + "float4 test(): COLOR \ + { \ + float4 color; \ + color[0] = 0.020; \ + color[1] = 0.245; \ + color[2] = 0.351; \ + color[3] = 1.0; \ + return color; \ + }"; + + static struct hlsl_probe_info vec4_indexing_test2_probes[] = + { + {0, 0, {0.5f, 0.3f, 0.8f, 0.2f}, 0.0001f, "vec4 indexing test 2 failed"} + }; + + /* We have this uniform i here so the compiler can't optimize */ + static const char *vec4_indexing_test2_shader = + "uniform int i; \ + float4 test(): COLOR \ + { \ + float4 color = float4(0.5, 0.4, 0.3, 0.2); \ + color.g = color[i]; \ + color.b = 0.8; \ + return color; \ + }"; + + ID3DXConstantTable *constants; + IDirect3DPixelShader9 *pshader; + + pshader = compile_pixel_shader9(device, vec4_indexing_test1_shader, "ps_2_0", &constants); + if (pshader != NULL) + { + compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, + vec4_indexing_test1_probes, 1, 1, 1, __LINE__); + + IUnknown_Release(constants); + IUnknown_Release(pshader); + } + + pshader = compile_pixel_shader9(device, vec4_indexing_test2_shader, "ps_2_0", &constants); + if (pshader != NULL) + { + ID3DXConstantTable_SetInt(constants, device, "i", 2); + + compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, + vec4_indexing_test2_probes, 1, 32, 1, __LINE__); + + IUnknown_Release(constants); + IUnknown_Release(pshader); + } +} + START_TEST(hlsl) { D3DCAPS9 caps; @@ -456,6 +517,7 @@ START_TEST(hlsl) test_swizzle(device, quad_geometry, vshader_passthru); test_math(device, quad_geometry, vshader_passthru); test_conditionals(device, quad_geometry, vshader_passthru); + test_float_vectors(device, quad_geometry, vshader_passthru); } } else skip("no pixel shader support\n");

1 0

Travis Athougies : d3dcompiler_43/tests: Added tests for conditional expressions to HLSL test suite.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 79f715c3ec66088860b777d5f508abe740f1813c URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f715c3ec66088860b777d5f… Author: Travis Athougies <iammisc(a)gmail.com> Date: Thu Oct 28 19:16:49 2010 -0700 d3dcompiler_43/tests: Added tests for conditional expressions to HLSL test suite. --- dlls/d3dcompiler_43/tests/hlsl.c | 65 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index e67d856..aeb0d4d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -370,6 +370,70 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo } } +static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, + IDirect3DVertexShader9 *vshader_passthru) +{ + static struct hlsl_probe_info if_greater_probes[] = + { + { 0, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, + { 5, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, + {10, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, + {15, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, + {25, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test failed"}, + {30, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test failed"} + }; + + static const char *if_greater_shader = + "float4 test(float2 pos: TEXCOORD0): COLOR \ + { \ + if((pos.x * 32.0) > 20.0) \ + return float4(0.1, 0.2, 0.3, 0.4); \ + else \ + return float4(0.9, 0.8, 0.7, 0.6); \ + }"; + + static struct hlsl_probe_info ternary_operator_probes[] = + { + {0, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, + {1, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, + {2, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, + {3, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, + {4, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test failed"}, + {5, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test failed"}, + {6, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test failed"}, + {7, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test failed"} + }; + + static const char *ternary_operator_shader = + "float4 test(float2 pos: TEXCOORD0): COLOR \ + { \ + return (pos.x < 0.5?float4(0.5, 0.25, 0.5, 0.75):float4(0.6, 0.8, 0.1, 0.2)); \ + }"; + + ID3DXConstantTable *constants; + IDirect3DPixelShader9 *pshader; + + pshader = compile_pixel_shader9(device, if_greater_shader, "ps_2_0", &constants); + if (pshader != NULL) + { + compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, + if_greater_probes, 6, 32, 1, __LINE__); + + IUnknown_Release(constants); + IUnknown_Release(pshader); + } + + pshader = compile_pixel_shader9(device, ternary_operator_shader, "ps_2_0", &constants); + if (pshader != NULL) + { + compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, + ternary_operator_probes, 7, 8, 1, __LINE__); + + IUnknown_Release(constants); + IUnknown_Release(pshader); + } +} + START_TEST(hlsl) { D3DCAPS9 caps; @@ -391,6 +455,7 @@ START_TEST(hlsl) { test_swizzle(device, quad_geometry, vshader_passthru); test_math(device, quad_geometry, vshader_passthru); + test_conditionals(device, quad_geometry, vshader_passthru); } } else skip("no pixel shader support\n");

1 0

Travis Athougies : d3dcompiler_43/tests: Added order of operations test to HLSL test suite.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 9f7ceec91f9cdad7e8b77941f85bb3ce831291f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f7ceec91f9cdad7e8b77941f… Author: Travis Athougies <iammisc(a)gmail.com> Date: Thu Oct 28 19:16:48 2010 -0700 d3dcompiler_43/tests: Added order of operations test to HLSL test suite. --- dlls/d3dcompiler_43/tests/hlsl.c | 44 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 08d0c09..e67d856 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -327,6 +327,49 @@ static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_ } } +static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, + IDirect3DVertexShader9 *vshader_passthru) +{ + /* Tests order of operations */ + static const float u = 2.5f, v = 0.3f, w = 0.2f, x = 0.7f, y = 0.1f, z = 1.5f; + + static struct hlsl_probe_info order_of_operations_probes[] = + { + {0, 0, {-12.4300f, 9.8333f, 1.6000f, 34.9999f}, 0.0001f, + "order of operations test failed"} + }; + + static const char *order_of_operations_shader = + "float4 test(uniform float u, uniform float v, uniform float w, uniform float x, \ + uniform float y, uniform float z): COLOR \ + { \ + return float4(x * y - z / w + --u / -v, \ + z * x / y + w / -v, \ + u + v - w, \ + x / y / w); \ + }"; + + ID3DXConstantTable *constants; + IDirect3DPixelShader9 *pshader; + + pshader = compile_pixel_shader9(device, order_of_operations_shader, "ps_2_0", &constants); + if (pshader != NULL) + { + ID3DXConstantTable_SetFloat(constants, device, "$u", u); + ID3DXConstantTable_SetFloat(constants, device, "$v", v); + ID3DXConstantTable_SetFloat(constants, device, "$w", w); + ID3DXConstantTable_SetFloat(constants, device, "$x", x); + ID3DXConstantTable_SetFloat(constants, device, "$y", y); + ID3DXConstantTable_SetFloat(constants, device, "$z", z); + + compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, + order_of_operations_probes, 1, 1, 1, __LINE__); + + IUnknown_Release(constants); + IUnknown_Release(pshader); + } +} + START_TEST(hlsl) { D3DCAPS9 caps; @@ -347,6 +390,7 @@ START_TEST(hlsl) todo_wine { test_swizzle(device, quad_geometry, vshader_passthru); + test_math(device, quad_geometry, vshader_passthru); } } else skip("no pixel shader support\n");

1 0

Aric Stewart : winegstreamer: Add gstreamer audio convert transform filter.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 0e55930effbfb5b6e79a77b5da4f4e0e5a52455e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e55930effbfb5b6e79a77b5d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 28 14:42:33 2010 -0500 winegstreamer: Add gstreamer audio convert transform filter. --- dlls/winegstreamer/gst_guids.h | 1 + dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gsttffilter.c | 113 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/main.c | 35 ++++++++++++ 4 files changed, 150 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gst_guids.h b/dlls/winegstreamer/gst_guids.h index 092c4f6..089cd9d 100644 --- a/dlls/winegstreamer/gst_guids.h +++ b/dlls/winegstreamer/gst_guids.h @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +DEFINE_GUID(CLSID_Gstreamer_AudioConvert, 0x334b2ec9, 0xf2b5, 0x40b9, 0x84, 0x32, 0x4a, 0x00, 0xe0, 0x03, 0x86, 0xa8); DEFINE_GUID(CLSID_Gstreamer_Mp3, 0x728dcf55, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); DEFINE_GUID(CLSID_Gstreamer_Splitter, 0xf9d8d64e, 0xa144, 0x47dc, 0x8e, 0xe0, 0xf5, 0x34, 0x98, 0x37, 0x2c, 0x29); DEFINE_GUID(WINESUBTYPE_Gstreamer, 0xffffffff, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index a838179..741fdf4 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -40,6 +40,7 @@ /* enum media */ void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); +IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr); diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 6237fac..9339299 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -690,6 +690,119 @@ IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *punkout, HRESULT *phr) return obj; } +static HRESULT WINAPI Gstreamer_AudioConvert_QueryConnect(TransformFilter *iface, const AM_MEDIA_TYPE *amt) { + GstTfImpl *This = (GstTfImpl*)iface; + TRACE("%p %p\n", This, amt); + dump_AM_MEDIA_TYPE(amt); + + if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) || + !IsEqualGUID(&amt->subtype, &MEDIASUBTYPE_PCM) || + !IsEqualGUID(&amt->formattype, &FORMAT_WaveFormatEx)) + return S_FALSE; + return S_OK; +} + +static HRESULT WINAPI Gstreamer_AudioConvert_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) +{ + return S_OK; +} + +static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) { + GstTfImpl *This = (GstTfImpl*)tf; + GstCaps *capsin, *capsout; + AM_MEDIA_TYPE *outpmt = &This->tf.pmt; + WAVEFORMATEX *inwfe; + WAVEFORMATEX *outwfe; + WAVEFORMATEXTENSIBLE *outwfx; + HRESULT hr; + int inisfloat = 0, indepth; + + if (dir != PINDIR_INPUT) + return S_OK; + + if (Gstreamer_AudioConvert_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) + return E_FAIL; + + FreeMediaType(outpmt); + *outpmt = *amt; + outpmt->pUnk = NULL; + outpmt->cbFormat = sizeof(WAVEFORMATEXTENSIBLE); + outpmt->pbFormat = CoTaskMemAlloc(outpmt->cbFormat); + + inwfe = (WAVEFORMATEX*)amt->pbFormat; + indepth = inwfe->wBitsPerSample; + if (inwfe->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { + WAVEFORMATEXTENSIBLE *inwfx = (WAVEFORMATEXTENSIBLE*)inwfe; + inisfloat = IsEqualGUID(&inwfx->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); + if (inwfx->Samples.wValidBitsPerSample) + indepth = inwfx->Samples.wValidBitsPerSample; + } + + capsin = gst_caps_new_simple(inisfloat ? "audio/x-raw-float" : "audio/x-raw-int", + "endianness", G_TYPE_INT, 1234, + "width", G_TYPE_INT, inwfe->wBitsPerSample, + "depth", G_TYPE_INT, indepth, + "channels", G_TYPE_INT, inwfe->nChannels, + "rate", G_TYPE_INT, inwfe->nSamplesPerSec, + NULL); + + outwfe = (WAVEFORMATEX*)outpmt->pbFormat; + outwfx = (WAVEFORMATEXTENSIBLE*)outwfe; + outwfe->wFormatTag = WAVE_FORMAT_EXTENSIBLE; + outwfe->nChannels = 2; + outwfe->nSamplesPerSec = inwfe->nSamplesPerSec; + outwfe->wBitsPerSample = 16; + outwfe->nBlockAlign = outwfe->nChannels * outwfe->wBitsPerSample / 8; + outwfe->nAvgBytesPerSec = outwfe->nBlockAlign * outwfe->nSamplesPerSec; + outwfe->cbSize = sizeof(*outwfx) - sizeof(*outwfe); + outwfx->Samples.wValidBitsPerSample = outwfe->wBitsPerSample; + outwfx->dwChannelMask = SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT; + outwfx->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + + capsout = gst_caps_new_simple("audio/x-raw-int", + "endianness", G_TYPE_INT, 1234, + "width", G_TYPE_INT, outwfe->wBitsPerSample, + "depth", G_TYPE_INT, outwfx->Samples.wValidBitsPerSample, + "channels", G_TYPE_INT, outwfe->nChannels, + "rate", G_TYPE_INT, outwfe->nSamplesPerSec, + NULL); + + hr = Gstreamer_transform_ConnectInput(This, amt, capsin, capsout); + FIXME("%08x\n", hr); + gst_caps_unref(capsin); + gst_caps_unref(capsout); + + This->cbBuffer = inwfe->nAvgBytesPerSec; + return hr; +} + +static const TransformFilterFuncTable Gstreamer_AudioConvert_vtbl = { + Gstreamer_transform_DecideBufferSize, + Gstreamer_transform_ProcessBegin, + Gstreamer_transform_ProcessData, + Gstreamer_transform_ProcessEnd, + Gstreamer_AudioConvert_QueryConnect, + Gstreamer_AudioConvert_SetMediaType, + Gstreamer_AudioConvert_ConnectInput, + Gstreamer_transform_Cleanup, + Gstreamer_transform_EndOfStream, + Gstreamer_transform_BeginFlush, + Gstreamer_transform_EndFlush, + Gstreamer_transform_NewSegment +}; + +IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *punkout, HRESULT *phr) +{ + IUnknown *obj = NULL; + if (!Gstreamer_init()) + { + *phr = E_FAIL; + return NULL; + } + *phr = Gstreamer_transform_create(punkout, &CLSID_Gstreamer_AudioConvert, "audioconvert", &Gstreamer_AudioConvert_vtbl, (LPVOID*)&obj); + return obj; +} + HRESULT WINAPI GSTTf_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { HRESULT hr; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 6007ac7..ac9e97b 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -49,6 +49,8 @@ static const WCHAR wGstreamer_YUV[] = {'G','S','t','r','e','a','m','e','r',' ','Y','U','V',' ','f','i','l','t','e','r',0}; static const WCHAR wGstreamer_Mp3[] = {'G','S','t','r','e','a','m','e','r',' ','M','p','3',' ','f','i','l','t','e','r',0}; +static const WCHAR wGstreamer_AudioConvert[] = +{'G','S','t','r','e','a','m','e','r',' ','A','u','d','i','o','C','o','n','v','e','r','t',' ','f','i','l','t','e','r',0}; static WCHAR wNull[] = {'\0'}; @@ -149,6 +151,32 @@ AMOVIESETUP_FILTER const amfMp3 = amfMp3Pin }; +AMOVIESETUP_PIN amfAudioConvertPin[] = +{ { wNull, + FALSE, FALSE, FALSE, FALSE, + &GUID_NULL, + NULL, + 1, + amfMTaudio + }, + { + wNull, + FALSE, TRUE, FALSE, FALSE, + &GUID_NULL, + NULL, + 1, + amfMTaudio + }, +}; + +AMOVIESETUP_FILTER const amfAudioConvert = +{ &CLSID_Gstreamer_AudioConvert, + wGstreamer_AudioConvert, + MERIT_UNLIKELY, + 2, + amfAudioConvertPin +}; + FactoryTemplate const g_Templates[] = { { wGstreamer_Splitter, @@ -171,6 +199,13 @@ FactoryTemplate const g_Templates[] = { NULL, &amfMp3, }, + { + wGstreamer_AudioConvert, + &CLSID_Gstreamer_AudioConvert, + Gstreamer_AudioConvert_create, + NULL, + &amfAudioConvert, + }, }; const int g_cTemplates = sizeof(g_Templates) / sizeof (g_Templates[0]);

1 0

Aric Stewart : winegstreamer: Add gstreamer mp3 transform filter.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 5e79508fe96bc722a8c7823efd85350a43f82f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e79508fe96bc722a8c7823ef… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 28 14:42:29 2010 -0500 winegstreamer: Add gstreamer mp3 transform filter. --- dlls/winegstreamer/gst_guids.h | 1 + dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gsttffilter.c | 125 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/main.c | 35 +++++++++++ 4 files changed, 162 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gst_guids.h b/dlls/winegstreamer/gst_guids.h index 4445578..092c4f6 100644 --- a/dlls/winegstreamer/gst_guids.h +++ b/dlls/winegstreamer/gst_guids.h @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +DEFINE_GUID(CLSID_Gstreamer_Mp3, 0x728dcf55, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); DEFINE_GUID(CLSID_Gstreamer_Splitter, 0xf9d8d64e, 0xa144, 0x47dc, 0x8e, 0xe0, 0xf5, 0x34, 0x98, 0x37, 0x2c, 0x29); DEFINE_GUID(WINESUBTYPE_Gstreamer, 0xffffffff, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); DEFINE_GUID(CLSID_Gstreamer_YUV, 0x2d5507df, 0x5ac9, 0x4bb9, 0x9c, 0x09, 0xb2, 0x80, 0xfc, 0x0b, 0xce, 0x01); diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index a11e8ae..a838179 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -40,6 +40,7 @@ /* enum media */ void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); +IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr); diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 7a13e6f..6237fac 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -47,6 +47,7 @@ #include "wine/debug.h" #include "initguid.h" +DEFINE_GUID(WMMEDIASUBTYPE_MP3, 0x00000055, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); @@ -441,6 +442,130 @@ static HRESULT Gstreamer_transform_create(IUnknown *punkout, const CLSID *clsid, return S_OK; } +static HRESULT WINAPI Gstreamer_Mp3_QueryConnect(TransformFilter *iface, const AM_MEDIA_TYPE *amt) { + GstTfImpl *This = (GstTfImpl*)iface; + TRACE("%p %p\n", This, amt); + dump_AM_MEDIA_TYPE(amt); + + if ( (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) && + !IsEqualGUID(&amt->majortype, &MEDIATYPE_Stream)) || + (!IsEqualGUID(&amt->subtype, &MEDIASUBTYPE_MPEG1AudioPayload) && + !IsEqualGUID(&amt->subtype, &WMMEDIASUBTYPE_MP3)) + || !IsEqualGUID(&amt->formattype, &FORMAT_WaveFormatEx)) + return S_FALSE; + + return S_OK; +} + +static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) { + GstTfImpl *This = (GstTfImpl*)tf; + GstCaps *capsin, *capsout; + AM_MEDIA_TYPE *outpmt = &This->tf.pmt; + WAVEFORMATEX *wfx, *wfxin; + HRESULT hr; + int layer; + + if (dir != PINDIR_INPUT) + return S_OK; + + if (Gstreamer_Mp3_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) + return VFW_E_TYPE_NOT_ACCEPTED; + + wfxin = (WAVEFORMATEX*)amt->pbFormat; + switch (wfxin->wFormatTag) { + case WAVE_FORMAT_MPEGLAYER3: + layer = 3; + break; + case WAVE_FORMAT_MPEG: { + MPEG1WAVEFORMAT *mpgformat = (MPEG1WAVEFORMAT*)wfxin; + layer = mpgformat->fwHeadLayer; + break; + } + default: + FIXME("Unhandled tag %x\n", wfxin->wFormatTag); + return E_FAIL; + } + + FreeMediaType(outpmt); + CopyMediaType(outpmt, amt); + + outpmt->subtype = MEDIASUBTYPE_PCM; + outpmt->formattype = FORMAT_WaveFormatEx; + outpmt->cbFormat = sizeof(*wfx); + CoTaskMemFree(outpmt->pbFormat); + wfx = CoTaskMemAlloc(outpmt->cbFormat); + outpmt->pbFormat = (BYTE*)wfx; + wfx->wFormatTag = WAVE_FORMAT_PCM; + wfx->wBitsPerSample = 16; + wfx->nSamplesPerSec = wfxin->nSamplesPerSec; + wfx->nChannels = wfxin->nChannels; + wfx->nBlockAlign = wfx->wBitsPerSample * wfx->nChannels / 8; + wfx->cbSize = 0; + wfx->nAvgBytesPerSec = wfx->nSamplesPerSec * wfx->nBlockAlign; + + capsin = gst_caps_new_simple("audio/mpeg", + "mpegversion", G_TYPE_INT, 1, + "layer", G_TYPE_INT, layer, + "rate", G_TYPE_INT, wfx->nSamplesPerSec, + "channels", G_TYPE_INT, wfx->nChannels, + NULL); + capsout = gst_caps_new_simple("audio/x-raw-int", + "endianness", G_TYPE_INT, 1234, + "signed", G_TYPE_BOOLEAN, 1, + "width", G_TYPE_INT, 16, + "depth", G_TYPE_INT, 16, + "rate", G_TYPE_INT, wfx->nSamplesPerSec, + "channels", G_TYPE_INT, wfx->nChannels, + NULL); + + hr = Gstreamer_transform_ConnectInput(This, amt, capsin, capsout); + gst_caps_unref(capsin); + gst_caps_unref(capsout); + + This->cbBuffer = wfx->nAvgBytesPerSec / 4; + + return hr; +} + +static HRESULT WINAPI Gstreamer_Mp3_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) +{ + return S_OK; +} + +static const TransformFilterFuncTable Gstreamer_Mp3_vtbl = { + Gstreamer_transform_DecideBufferSize, + Gstreamer_transform_ProcessBegin, + Gstreamer_transform_ProcessData, + Gstreamer_transform_ProcessEnd, + Gstreamer_Mp3_QueryConnect, + Gstreamer_Mp3_SetMediaType, + Gstreamer_Mp3_ConnectInput, + Gstreamer_transform_Cleanup, + Gstreamer_transform_EndOfStream, + Gstreamer_transform_BeginFlush, + Gstreamer_transform_EndFlush, + Gstreamer_transform_NewSegment +}; + +IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *punkout, HRESULT *phr) +{ + const char *plugin; + IUnknown *obj = NULL; + if (!Gstreamer_init()) + { + *phr = E_FAIL; + return NULL; + } + plugin = Gstreamer_FindMatch("audio/mpeg, mpegversion=(int) 1"); + if (!plugin) + { + *phr = E_FAIL; + return NULL; + } + *phr = Gstreamer_transform_create(punkout, &CLSID_Gstreamer_Mp3, plugin, &Gstreamer_Mp3_vtbl, (LPVOID*)&obj); + return obj; +} + static HRESULT WINAPI Gstreamer_YUV_QueryConnect(TransformFilter *iface, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)iface; TRACE("%p %p\n", This, amt); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index dba15c5..6007ac7 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -47,6 +47,8 @@ static const WCHAR wGstreamer_Splitter[] = {'G','S','t','r','e','a','m','e','r',' ','s','p','l','i','t','t','e','r',' ','f','i','l','t','e','r',0}; static const WCHAR wGstreamer_YUV[] = {'G','S','t','r','e','a','m','e','r',' ','Y','U','V',' ','f','i','l','t','e','r',0}; +static const WCHAR wGstreamer_Mp3[] = +{'G','S','t','r','e','a','m','e','r',' ','M','p','3',' ','f','i','l','t','e','r',0}; static WCHAR wNull[] = {'\0'}; @@ -121,6 +123,32 @@ static const AMOVIESETUP_FILTER amfYUV = amfYUVPin }; +AMOVIESETUP_PIN amfMp3Pin[] = +{ { wNull, + FALSE, FALSE, FALSE, FALSE, + &GUID_NULL, + NULL, + 1, + amfMTaudio + }, + { + wNull, + FALSE, TRUE, FALSE, FALSE, + &GUID_NULL, + NULL, + 1, + amfMTaudio + }, +}; + +AMOVIESETUP_FILTER const amfMp3 = +{ &CLSID_Gstreamer_Mp3, + wGstreamer_Mp3, + MERIT_NORMAL, + 2, + amfMp3Pin +}; + FactoryTemplate const g_Templates[] = { { wGstreamer_Splitter, @@ -136,6 +164,13 @@ FactoryTemplate const g_Templates[] = { NULL, &amfYUV, }, + { + wGstreamer_Mp3, + &CLSID_Gstreamer_Mp3, + Gstreamer_Mp3_create, + NULL, + &amfMp3, + }, }; const int g_cTemplates = sizeof(g_Templates) / sizeof (g_Templates[0]);

1 0

Hans Leidekker : advapi32: Implement EnumServicesStatusExA/W.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 7135ac76412fabbe918108af857d775adb6cb440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7135ac76412fabbe918108af8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 29 12:53:37 2010 +0200 advapi32: Implement EnumServicesStatusExA/W. --- dlls/advapi32/service.c | 128 +++++++++++++++++++++++++++++++++++------ dlls/advapi32/tests/service.c | 52 ++-------------- include/wine/svcctl.idl | 11 ++++ programs/services/rpc.c | 104 +++++++++++++++++++++++++++++++++ 4 files changed, 233 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7135ac76412fabbe91810…

1 0

Henri Verbeet : wined3d: Remove some redundant state save/ restore code from flush_to_framebuffer_drawpixels().
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 27bf4c3747ab76deab63506d254e2372d4ae79d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27bf4c3747ab76deab63506d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 29 12:25:19 2010 +0200 wined3d: Remove some redundant state save/restore code from flush_to_framebuffer_drawpixels(). --- dlls/wined3d/surface.c | 27 ++++++++------------------- 1 files changed, 8 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3f08155..3a18f9e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1734,10 +1734,9 @@ lock_end: return IWineD3DBaseSurfaceImpl_Map(iface, pLockedRect, pRect, Flags); } -static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fmt, GLenum type, UINT bpp, const BYTE *mem) { - GLint prev_store; - GLint prev_rasterpos[4]; - GLint skipBytes = 0; +static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, + GLenum fmt, GLenum type, UINT bpp, const BYTE *mem) +{ UINT pitch = IWineD3DSurface_GetPitch((IWineD3DSurface *) This); /* target is argb, 4 byte */ IWineD3DDeviceImpl *device = This->resource.device; const struct wined3d_gl_info *gl_info; @@ -1763,15 +1762,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm context_set_draw_buffer(context, device->offscreenBuffer); } - glGetIntegerv(GL_PACK_SWAP_BYTES, &prev_store); - checkGLcall("glGetIntegerv"); - glGetIntegerv(GL_CURRENT_RASTER_POSITION, &prev_rasterpos[0]); - checkGLcall("glGetIntegerv"); - - /* If not fullscreen, we need to skip a number of bytes to find the next row of data */ - glGetIntegerv(GL_UNPACK_ROW_LENGTH, &skipBytes); - glPixelStorei(GL_UNPACK_ROW_LENGTH, This->currentDesc.Width); - glRasterPos3i(This->lockedRect.left, This->lockedRect.top, 1); checkGLcall("glRasterPos3i"); @@ -1791,6 +1781,9 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm read = This->resource.allocatedMemory[0]; } + /* If not fullscreen, we need to skip a number of bytes to find the next row of data */ + glPixelStorei(GL_UNPACK_ROW_LENGTH, This->currentDesc.Width); + if(This->Flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); checkGLcall("glBindBufferARB"); @@ -1815,12 +1808,8 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm checkGLcall("glBindBufferARB"); } - glRasterPos3iv(&prev_rasterpos[0]); - checkGLcall("glRasterPos3iv"); - - /* Reset to previous pack row length */ - glPixelStorei(GL_UNPACK_ROW_LENGTH, skipBytes); - checkGLcall("glPixelStorei(GL_UNPACK_ROW_LENGTH)"); + glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + checkGLcall("glPixelStorei(GL_UNPACK_ROW_LENGTH, 0)"); LEAVE_GL(); context_release(context);

1 0

Henri Verbeet : wined3d: Don' t flip the coordinate system in set_blit_dimension().
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 7414ebc97596d0fe9b3042bee8ec44260a31aa4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7414ebc97596d0fe9b3042bee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 29 12:25:18 2010 +0200 wined3d: Don't flip the coordinate system in set_blit_dimension(). --- dlls/wined3d/arb_program_shader.c | 7 +++-- dlls/wined3d/context.c | 2 +- dlls/wined3d/surface.c | 46 +++++++++++++++--------------------- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 660f60b..f182a8f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7168,10 +7168,11 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ * whereas the real gl drawable size is the size of the window. */ dst_swapchain = dst_surface->container.type == WINED3D_CONTAINER_SWAPCHAIN ? dst_surface->container.u.swapchain : NULL; - if (dst_swapchain && dst_surface == dst_swapchain->front_buffer) - surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); - else if (surface_is_offscreen(dst_surface)) + if (!surface_is_offscreen(dst_surface)) { + if (dst_swapchain && dst_surface == dst_swapchain->front_buffer) + surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); + dst_rect.top = dst_surface->currentDesc.Height - dst_rect.top; dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 00b6031..618ccd4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1622,7 +1622,7 @@ static inline void set_blit_dimension(UINT width, UINT height) { checkGLcall("glMatrixMode(GL_PROJECTION)"); glLoadIdentity(); checkGLcall("glLoadIdentity()"); - glOrtho(0, width, height, 0, 0.0, -1.0); + glOrtho(0, width, 0, height, 0.0, -1.0); checkGLcall("glOrtho"); glViewport(0, 0, width, height); checkGLcall("glViewport"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b24a6de..3f08155 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1767,8 +1767,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm checkGLcall("glGetIntegerv"); glGetIntegerv(GL_CURRENT_RASTER_POSITION, &prev_rasterpos[0]); checkGLcall("glGetIntegerv"); - glPixelZoom(1.0f, -1.0f); - checkGLcall("glPixelZoom"); /* If not fullscreen, we need to skip a number of bytes to find the next row of data */ glGetIntegerv(GL_UNPACK_ROW_LENGTH, &skipBytes); @@ -1817,9 +1815,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm checkGLcall("glBindBufferARB"); } - glPixelZoom(1.0f, 1.0f); - checkGLcall("glPixelZoom"); - glRasterPos3iv(&prev_rasterpos[0]); checkGLcall("glRasterPos3iv"); @@ -3053,7 +3048,7 @@ static void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *dst_surface, IWine left = src_rect->left; right = src_rect->right; - if (upsidedown) + if (!upsidedown) { top = src_surface->currentDesc.Height - src_rect->top; bottom = src_surface->currentDesc.Height - src_rect->bottom; @@ -3082,19 +3077,19 @@ static void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *dst_surface, IWine glBegin(GL_QUADS); /* bottom left */ glTexCoord2f(left, bottom); - glVertex2i(0, fbheight); + glVertex2i(0, 0); /* top left */ glTexCoord2f(left, top); - glVertex2i(0, fbheight - dst_rect.bottom - dst_rect.top); + glVertex2i(0, dst_rect.bottom - dst_rect.top); /* top right */ glTexCoord2f(right, top); - glVertex2i(dst_rect.right - dst_rect.left, fbheight - dst_rect.bottom - dst_rect.top); + glVertex2i(dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top); /* bottom right */ glTexCoord2f(right, bottom); - glVertex2i(dst_rect.right - dst_rect.left, fbheight); + glVertex2i(dst_rect.right - dst_rect.left, 0); glEnd(); checkGLcall("glEnd and previous"); @@ -3140,21 +3135,21 @@ static void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *dst_surface, IWine glBegin(GL_QUADS); /* top left */ - glTexCoord2f(0.0f, (float)fbheight / (float)src_surface->pow2Height); - glVertex2i(0, 0); - - /* bottom left */ glTexCoord2f(0.0f, 0.0f); glVertex2i(0, fbheight); - /* bottom right */ - glTexCoord2f((float)fbwidth / (float)src_surface->pow2Width, 0.0f); - glVertex2i(fbwidth, src_surface->currentDesc.Height); + /* bottom left */ + glTexCoord2f(0.0f, (float)fbheight / (float)src_surface->pow2Height); + glVertex2i(0, 0); - /* top right */ + /* bottom right */ glTexCoord2f((float)fbwidth / (float)src_surface->pow2Width, (float)fbheight / (float)src_surface->pow2Height); glVertex2i(fbwidth, 0); + + /* top right */ + glTexCoord2f((float)fbwidth / (float)src_surface->pow2Width, 0.0f); + glVertex2i(fbwidth, fbheight); glEnd(); } glDisable(texture_target); @@ -3368,16 +3363,13 @@ static void surface_blt_to_drawable(IWineD3DDeviceImpl *device, context = context_acquire(device, dst_surface); context_apply_blit_state(context, device); - /* context_apply_blit_state() sets up a flipped (in GL terms) projection - * matrix. As a result, we need to skip the flip for onscreen surfaces, - * and have to flip for offscreen surfaces instead, to undo the flip done - * by the projection matrix. */ - if (swapchain && dst_surface == swapchain->front_buffer) - { - surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); - } - else if (surface_is_offscreen(dst_surface)) + if (!surface_is_offscreen(dst_surface)) { + if (swapchain && dst_surface == swapchain->front_buffer) + { + surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); + } + dst_rect.top = dst_surface->currentDesc.Height - dst_rect.top; dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; }

1 0

Henri Verbeet : wined3d: Only complain about unsupported filtering if we have a reason to.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 1e301027dcbeef3f4885ee06d388f9a9318f042a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e301027dcbeef3f4885ee06d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 29 12:25:17 2010 +0200 wined3d: Only complain about unsupported filtering if we have a reason to. --- dlls/wined3d/surface_base.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 1324acf..b9dd634 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -947,11 +947,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D return WINEDDERR_SURFACEBUSY; } - if(Filter != WINED3DTEXF_NONE && Filter != WINED3DTEXF_POINT) { - /* Can happen when d3d9 apps do a StretchRect call which isn't handled in gl */ - FIXME("Filters not supported in software blit\n"); - } - /* First check for the validity of source / destination rectangles. * This was verified using a test application + by MSDN. */ @@ -1218,6 +1213,14 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D if (!dstwidth || !dstheight) /* hmm... stupid program ? */ goto release; + + if (Filter != WINED3DTEXF_NONE && Filter != WINED3DTEXF_POINT + && (srcwidth != dstwidth || srcheight != dstheight)) + { + /* Can happen when d3d9 apps do a StretchRect call which isn't handled in gl */ + FIXME("Filter %s not supported in software blit.\n", debug_d3dtexturefiltertype(Filter)); + } + sbase = (BYTE*)slock.pBits+(xsrc.top*slock.Pitch)+xsrc.left*bpp; xinc = (srcwidth << 16) / dstwidth; yinc = (srcheight << 16) / dstheight;

1 0

Henri Verbeet : wined3d: Move loop state to wined3d_shader_context.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: e832b57a15eb710698d4e587e669d206579ed52a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e832b57a15eb710698d4e587e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 29 12:25:16 2010 +0200 wined3d: Move loop state to wined3d_shader_context. --- dlls/wined3d/glsl_shader.c | 58 ++++++++++++++++++++++------------------ dlls/wined3d/shader.c | 4 +++ dlls/wined3d/wined3d_private.h | 8 +++++- 3 files changed, 43 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f548ed4..2b1d5b1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1419,7 +1419,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_LOOP: - sprintf(register_name, "aL%u", This->baseShader.cur_loop_regno - 1); + sprintf(register_name, "aL%u", ins->ctx->loop_state->current_reg - 1); break; case WINED3DSPR_SAMPLER: @@ -2822,6 +2822,7 @@ static void shader_glsl_sgn(const struct wined3d_shader_instruction *ins) /* FIXME: I don't think nested loops will work correctly this way. */ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { + struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; glsl_src_param_t src1_param; IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; const DWORD *control_values = NULL; @@ -2855,57 +2856,58 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) if (loop_control.step > 0) { shader_addline(ins->ctx->buffer, "for (aL%u = %u; aL%u < (%u * %d + %u); aL%u += %d) {\n", - shader->baseShader.cur_loop_depth, loop_control.start, - shader->baseShader.cur_loop_depth, loop_control.count, loop_control.step, loop_control.start, - shader->baseShader.cur_loop_depth, loop_control.step); + loop_state->current_depth, loop_control.start, + loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, + loop_state->current_depth, loop_control.step); } else if (loop_control.step < 0) { shader_addline(ins->ctx->buffer, "for (aL%u = %u; aL%u > (%u * %d + %u); aL%u += %d) {\n", - shader->baseShader.cur_loop_depth, loop_control.start, - shader->baseShader.cur_loop_depth, loop_control.count, loop_control.step, loop_control.start, - shader->baseShader.cur_loop_depth, loop_control.step); + loop_state->current_depth, loop_control.start, + loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, + loop_state->current_depth, loop_control.step); } else { shader_addline(ins->ctx->buffer, "for (aL%u = %u, tmpInt%u = 0; tmpInt%u < %u; tmpInt%u++) {\n", - shader->baseShader.cur_loop_depth, loop_control.start, shader->baseShader.cur_loop_depth, - shader->baseShader.cur_loop_depth, loop_control.count, - shader->baseShader.cur_loop_depth); + loop_state->current_depth, loop_control.start, loop_state->current_depth, + loop_state->current_depth, loop_control.count, + loop_state->current_depth); } } else { shader_addline(ins->ctx->buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z) {\n", - shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_regno, - src1_param.reg_name, shader->baseShader.cur_loop_depth, src1_param.reg_name, - shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_regno, src1_param.reg_name); + loop_state->current_depth, loop_state->current_reg, + src1_param.reg_name, loop_state->current_depth, src1_param.reg_name, + loop_state->current_depth, loop_state->current_reg, src1_param.reg_name); } - shader->baseShader.cur_loop_depth++; - shader->baseShader.cur_loop_regno++; + ++loop_state->current_depth; + ++loop_state->current_reg; } static void shader_glsl_end(const struct wined3d_shader_instruction *ins) { - IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; + struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; shader_addline(ins->ctx->buffer, "}\n"); if (ins->handler_idx == WINED3DSIH_ENDLOOP) { - shader->baseShader.cur_loop_depth--; - shader->baseShader.cur_loop_regno--; + --loop_state->current_depth; + --loop_state->current_reg; } if (ins->handler_idx == WINED3DSIH_ENDREP) { - shader->baseShader.cur_loop_depth--; + --loop_state->current_depth; } } static void shader_glsl_rep(const struct wined3d_shader_instruction *ins) { IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; + struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; glsl_src_param_t src0_param; const DWORD *control_values = NULL; const local_constant *constant; @@ -2923,17 +2925,21 @@ static void shader_glsl_rep(const struct wined3d_shader_instruction *ins) } } - if(control_values) { + if (control_values) + { shader_addline(ins->ctx->buffer, "for (tmpInt%d = 0; tmpInt%d < %d; tmpInt%d++) {\n", - shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_depth, - control_values[0], shader->baseShader.cur_loop_depth); - } else { + loop_state->current_depth, loop_state->current_depth, + control_values[0], loop_state->current_depth); + } + else + { shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); shader_addline(ins->ctx->buffer, "for (tmpInt%d = 0; tmpInt%d < %s; tmpInt%d++) {\n", - shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_depth, - src0_param.param_str, shader->baseShader.cur_loop_depth); + loop_state->current_depth, loop_state->current_depth, + src0_param.param_str, loop_state->current_depth); } - shader->baseShader.cur_loop_depth++; + + ++loop_state->current_depth; } static void shader_glsl_if(const struct wined3d_shader_instruction *ins) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 972d0e2..5a7f3f3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1190,6 +1190,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe struct wined3d_shader_dst_param dst_param[2]; struct wined3d_shader_src_param src_param[4]; struct wined3d_shader_version shader_version; + struct wined3d_shader_loop_state loop_state; struct wined3d_shader_instruction ins; struct wined3d_shader_tex_mx tex_mx; struct wined3d_shader_context ctx; @@ -1198,12 +1199,15 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe /* Initialize current parsing state. */ tex_mx.current_row = 0; + loop_state.current_depth = 0; + loop_state.current_reg = 0; ctx.shader = iface; ctx.gl_info = &device->adapter->gl_info; ctx.reg_maps = reg_maps; ctx.buffer = buffer; ctx.tex_mx = &tex_mx; + ctx.loop_state = &loop_state; ctx.backend_data = backend_ctx; ins.ctx = &ctx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d85dc68..6f6f0ce 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -573,6 +573,12 @@ struct wined3d_shader_tex_mx DWORD texcoord_w[2]; }; +struct wined3d_shader_loop_state +{ + UINT current_depth; + UINT current_reg; +}; + struct wined3d_shader_context { IWineD3DBaseShader *shader; @@ -580,6 +586,7 @@ struct wined3d_shader_context const struct shader_reg_maps *reg_maps; struct wined3d_shader_buffer *buffer; struct wined3d_shader_tex_mx *tex_mx; + struct wined3d_shader_loop_state *loop_state; void *backend_data; }; @@ -2747,7 +2754,6 @@ typedef struct IWineD3DBaseShaderClass SHADER_LIMITS limits; DWORD *function; UINT functionLength; - UINT cur_loop_depth, cur_loop_regno; BOOL load_local_constsF; const struct wined3d_shader_frontend *frontend; void *frontend_data;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010