September 2012 - Wine-Commits

Henri Verbeet : wined3d: Just return the shader from wined3d_device_get_vertex_shader().
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 6909b5143be25cfc4f29e1436d2049addeb1f86b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6909b5143be25cfc4f29e1436… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 23 22:14:48 2012 +0200 wined3d: Just return the shader from wined3d_device_get_vertex_shader(). --- dlls/d3d8/device.c | 10 +++------- dlls/d3d9/device.c | 4 +--- dlls/wined3d/device.c | 9 +-------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5325a6d..709ac52 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2174,7 +2174,6 @@ static HRESULT WINAPI d3d8_device_DeleteVertexShader(IDirect3DDevice8 *iface, DW { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_vertex_shader *shader_impl; - struct wined3d_shader *cur; TRACE("iface %p, shader %#x.\n", iface, shader); @@ -2187,12 +2186,9 @@ static HRESULT WINAPI d3d8_device_DeleteVertexShader(IDirect3DDevice8 *iface, DW return D3DERR_INVALIDCALL; } - if ((cur = wined3d_device_get_vertex_shader(device->wined3d_device))) - { - if (cur == shader_impl->wined3d_shader) - IDirect3DDevice8_SetVertexShader(iface, 0); - wined3d_shader_decref(cur); - } + if (shader_impl->wined3d_shader + && wined3d_device_get_vertex_shader(device->wined3d_device) == shader_impl->wined3d_shader) + IDirect3DDevice8_SetVertexShader(iface, 0); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5a17943..0418d69 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2286,13 +2286,11 @@ static HRESULT WINAPI d3d9_device_GetVertexShader(IDirect3DDevice9Ex *iface, IDi TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device); - if (wined3d_shader) + if ((wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) { shader_impl = wined3d_shader_get_parent(wined3d_shader); *shader = &shader_impl->IDirect3DVertexShader9_iface; IDirect3DVertexShader9_AddRef(*shader); - wined3d_shader_decref(wined3d_shader); } else { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2cf0f85..664f1bd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2480,16 +2480,9 @@ void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struc struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wined3d_device *device) { - struct wined3d_shader *shader; - TRACE("device %p.\n", device); - shader = device->stateBlock->state.vertex_shader; - if (shader) - wined3d_shader_incref(shader); - - TRACE("Returning %p.\n", shader); - return shader; + return device->stateBlock->state.vertex_shader; } HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device,

1 0

Dmitry Timoshkov : windowscodecs: Return WINCODEC_ERR_FRAMEMISSING if there is no global GIF palette.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 56f37637b8dd5a9a8096c2711cd1d680c12d95d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f37637b8dd5a9a8096c2711… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 24 13:22:42 2012 +0900 windowscodecs: Return WINCODEC_ERR_FRAMEMISSING if there is no global GIF palette. --- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/tests/gifformat.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 81bde20..c378348 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1169,7 +1169,7 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalette *pIPalette) { TRACE("(%p,%p)\n", iface, pIPalette); - return WINCODEC_ERR_PALETTEUNAVAILABLE; + return WINCODEC_ERR_FRAMEMISSING; } static HRESULT WINAPI GifDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 4c78ebb..8788696 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -95,7 +95,6 @@ static void test_local_gif_palette(void) /* global palette */ hr = IWICBitmapDecoder_CopyPalette(decoder, palette); -todo_wine ok(hr == WINCODEC_ERR_FRAMEMISSING, "expected WINCODEC_ERR_FRAMEMISSING, got %#x\n", hr);

1 0

Dmitry Timoshkov : windowscodecs: Fix calculation of transparent GIF color index.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 507abc41ca0fb9fe82cef393d77d021a14596867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=507abc41ca0fb9fe82cef393d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 24 13:22:49 2012 +0900 windowscodecs: Fix calculation of transparent GIF color index. --- dlls/windowscodecs/gifformat.c | 6 +++--- dlls/windowscodecs/tests/gifformat.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index c378348..fc6909b 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -729,9 +729,9 @@ static HRESULT WINAPI GifFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, /* look for the transparent color extension */ for (i = 0; i < This->frame->Extensions.ExtensionBlockCount; ++i) { eb = This->frame->Extensions.ExtensionBlocks + i; - if (eb->Function == 0xF9 && eb->ByteCount == 4) { - if ((eb->Bytes[0] & 1) == 1) { - trans = (unsigned char)eb->Bytes[3]; + if (eb->Function == GRAPHICS_EXT_FUNC_CODE && eb->ByteCount == 8) { + if (eb->Bytes[3] & 1) { + trans = (unsigned char)eb->Bytes[6]; colors[trans] &= 0xffffff; /* set alpha to 0 */ break; } diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 8788696..b9c1059 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -118,7 +118,6 @@ static void test_local_gif_palette(void) ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); -todo_wine ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); ok(color[2] == 0xff070809, "expected 0xff070809, got %#x\n", color[2]); ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]);

1 0

Henri Verbeet : wined3d: Take the data type of immediates into account in shader_glsl_get_register_name ().
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: eb4d20ef3181c42741bad790e4ac87fa39f0b6b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4d20ef3181c42741bad790e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 23 22:14:49 2012 +0200 wined3d: Take the data type of immediates into account in shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5c0cdfb..14d165b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1478,13 +1478,49 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->immconst_type) { case WINED3D_IMMCONST_SCALAR: - sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); + switch (reg->data_type) + { + case WINED3D_DATA_FLOAT: + sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); + break; + case WINED3D_DATA_INT: + sprintf(register_name, "%#x", reg->immconst_data[0]); + break; + case WINED3D_DATA_RESOURCE: + case WINED3D_DATA_SAMPLER: + case WINED3D_DATA_UINT: + sprintf(register_name, "%#xu", reg->immconst_data[0]); + break; + default: + sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + break; + } break; case WINED3D_IMMCONST_VEC4: - sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", - *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], - *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); + switch (reg->data_type) + { + case WINED3D_DATA_FLOAT: + sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", + *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], + *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); + break; + case WINED3D_DATA_INT: + sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)", + reg->immconst_data[0], reg->immconst_data[1], + reg->immconst_data[2], reg->immconst_data[3]); + break; + case WINED3D_DATA_RESOURCE: + case WINED3D_DATA_SAMPLER: + case WINED3D_DATA_UINT: + sprintf(register_name, "uvec4(%#xu, %#xu, %#xu, %#xu)", + reg->immconst_data[0], reg->immconst_data[1], + reg->immconst_data[2], reg->immconst_data[3]); + break; + default: + sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + break; + } break; default:

1 0

Christian Costa : amstream: Rename media stream objects and their method names for multi interfaces support .
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: b74bcb61f9fa97c0c7179996b56c070778bd73c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74bcb61f9fa97c0c7179996b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 23 20:43:31 2012 +0200 amstream: Rename media stream objects and their method names for multi interfaces support. --- dlls/amstream/mediastream.c | 178 +++++++++++++++++++++--------------------- 1 files changed, 89 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b74bcb61f9fa97c0c7179…

1 0

Dmitry Timoshkov : windowscodecs: Add some tests for GIF global palette.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: af8b90c1062544f398409ce61fa24917cb554623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8b90c1062544f398409ce61… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 24 13:22:57 2012 +0900 windowscodecs: Add some tests for GIF global palette. --- dlls/windowscodecs/tests/gifformat.c | 73 ++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index b9c1059..b633ad0 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -25,6 +25,14 @@ #include "wincodec.h" #include "wine/test.h" +static const char gif_global_palette[] = { +/* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0xa1,0x02,0x00, +/* palette */0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c, +/* GCE */0x21,0xf9,0x04,0x01,0x05,0x00,0x01,0x00, /* index 1 */ +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00, +0x02,0x02,0x44,0x01,0x00,0x3b +}; + static const char gif_local_palette[] = { /* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0x27,0x02,0x00, /* GCE */0x21,0xf9,0x04,0x01,0x05,0x00,0x01,0x00, /* index 1 */ @@ -77,6 +85,70 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size return decoder; } +static void test_global_gif_palette(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICPalette *palette; + GUID format; + UINT count, ret; + WICColor color[256]; + + decoder = create_decoder(gif_global_palette, sizeof(gif_global_palette)); + ok(decoder != 0, "Failed to load GIF image data\n"); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + + /* global palette */ + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); +todo_wine + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); +todo_wine + ok(count == 4, "expected 4, got %u\n", count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); +todo_wine { + ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); + ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); + ok(color[2] == 0xff070809, "expected 0xff070809, got %#x\n", color[2]); + ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]); +} + /* frame palette */ + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "wrong pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); + ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); + ok(color[2] == 0xff070809, "expected 0xff070809, got %#x\n", color[2]); + ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + static void test_local_gif_palette(void) { HRESULT hr; @@ -137,6 +209,7 @@ START_TEST(gifformat) ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); if (FAILED(hr)) return; + test_global_gif_palette(); test_local_gif_palette(); IWICImagingFactory_Release(factory);

1 0

Christian Costa : amstream: Add IAMMediaStream interface to DirectDrawMediaStream object.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 6b73c61c63aec72f2635f4b1080693e623d2bb09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b73c61c63aec72f2635f4b10… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 23 20:43:40 2012 +0200 amstream: Add IAMMediaStream interface to DirectDrawMediaStream object. --- dlls/amstream/mediastream.c | 236 ++++++++++++++++++++++++++++++++++++---- dlls/amstream/tests/amstream.c | 4 +- 2 files changed, 218 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b73c61c63aec72f2635f…

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_shader_variable_GetGeometryShader().
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 90df33f0b3be029c442da4125ba9579aa4c0939f URL: http://source.winehq.org/git/wine.git/?a=commit;h=90df33f0b3be029c442da4125… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 23 22:14:45 2012 +0200 d3d10: Implement d3d10_effect_shader_variable_GetGeometryShader(). --- dlls/d3d10/effect.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 0d8bd0e..902bf5a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -5641,9 +5641,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10GeometryShader **shader) { - FIXME("iface %p, index %u, shader %p stub!\n", iface, index, shader); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_shader_variable *s; - return E_NOTIMPL; + TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + + if (v->type->basetype != D3D10_SVT_GEOMETRYSHADER) + { + WARN("Shader is not a geometry shader.\n"); + return E_FAIL; + } + + s = v->data; + if ((*shader = s->shader.gs)) + ID3D10GeometryShader_AddRef(*shader); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetPixelShader(

1 0

Michael Stefaniuc : shell32/tests: Use the explicit type for a function pointer.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 5c02bc11e102a41236a8477f42ff583e09fc269f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c02bc11e102a41236a8477f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 21 17:52:51 2012 +0200 shell32/tests: Use the explicit type for a function pointer. --- dlls/shell32/tests/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ec96ed3..5130240 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1802,7 +1802,7 @@ static DWORD WINAPI hooked_WaitForInputIdle(HANDLE process, DWORD timeout) * by changing the entry for WaitForInputIdle() in the shell32 import address * table. */ -static void hook_WaitForInputIdle(void *new_func) +static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) { char *base; PIMAGE_NT_HEADERS nt_headers; @@ -1867,7 +1867,7 @@ static void test_dde(void) HANDLE map; char *shared_block; - hook_WaitForInputIdle((void *) hooked_WaitForInputIdle); + hook_WaitForInputIdle(hooked_WaitForInputIdle); sprintf(filename, "%s\\test file.sde", tmpdir);

1 0

Matteo Bruni : d3dcompiler: Parse "while" loops.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 5fc67931b809330d609236f102179d9e1a237127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc67931b809330d609236f10… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 21 16:25:56 2012 +0200 d3dcompiler: Parse "while" loops. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 14 +++ dlls/d3dcompiler_43/hlsl.y | 142 +++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 22207c9..03fe66c 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -707,6 +707,7 @@ enum hlsl_ir_node_type HLSL_IR_EXPR, HLSL_IR_FUNCTION_DECL, HLSL_IR_IF, + HLSL_IR_LOOP, HLSL_IR_JUMP, HLSL_IR_SWIZZLE, }; @@ -768,6 +769,13 @@ struct hlsl_ir_if struct list *else_instrs; }; +struct hlsl_ir_loop +{ + struct hlsl_ir_node node; + /* loop condition is stored in the body (as "if (!condition) break;") */ + struct list *body; +}; + struct hlsl_ir_assignment { struct hlsl_ir_node node; @@ -1068,6 +1076,12 @@ static inline struct hlsl_ir_if *if_from_node(const struct hlsl_ir_node *node) return CONTAINING_RECORD(node, struct hlsl_ir_if, node); } +static inline struct hlsl_ir_loop *loop_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_LOOP); + return CONTAINING_RECORD(node, struct hlsl_ir_loop, node); +} + BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 7bce054..491a826 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -256,6 +256,130 @@ static void declare_predefined_types(struct hlsl_scope *scope) add_type_to_scope(scope, type); } +static struct hlsl_ir_if *loop_condition(struct list *cond_list) +{ + struct hlsl_ir_if *out_cond; + struct hlsl_ir_expr *not_cond; + struct hlsl_ir_node *cond, *operands[3]; + struct hlsl_ir_jump *jump; + unsigned int count = list_count(cond_list); + + if (!count) + return NULL; + if (count != 1) + ERR("Got multiple expressions in a for condition.\n"); + + cond = LIST_ENTRY(list_head(cond_list), struct hlsl_ir_node, entry); + out_cond = d3dcompiler_alloc(sizeof(*out_cond)); + if (!out_cond) + { + ERR("Out of memory.\n"); + return NULL; + } + out_cond->node.type = HLSL_IR_IF; + operands[0] = cond; + operands[1] = operands[2] = NULL; + not_cond = new_expr(HLSL_IR_UNOP_LOGIC_NOT, operands, &cond->loc); + if (!not_cond) + { + ERR("Out of memory.\n"); + d3dcompiler_free(out_cond); + return NULL; + } + out_cond->condition = &not_cond->node; + jump = d3dcompiler_alloc(sizeof(*jump)); + if (!jump) + { + ERR("Out of memory.\n"); + d3dcompiler_free(out_cond); + d3dcompiler_free(not_cond); + return NULL; + } + jump->node.type = HLSL_IR_JUMP; + jump->type = HLSL_IR_JUMP_BREAK; + out_cond->then_instrs = d3dcompiler_alloc(sizeof(*out_cond->then_instrs)); + if (!out_cond->then_instrs) + { + ERR("Out of memory.\n"); + d3dcompiler_free(out_cond); + d3dcompiler_free(not_cond); + d3dcompiler_free(jump); + return NULL; + } + list_init(out_cond->then_instrs); + list_add_head(out_cond->then_instrs, &jump->node.entry); + + return out_cond; +} + +enum loop_type +{ + LOOP_FOR, + LOOP_WHILE, + LOOP_DO_WHILE +}; + +static struct list *create_loop(enum loop_type type, struct list *init, struct list *cond, + struct list *iter, struct list *body, struct source_location *loc) +{ + struct list *list = NULL; + struct hlsl_ir_loop *loop = NULL; + struct hlsl_ir_if *cond_jump = NULL; + + list = d3dcompiler_alloc(sizeof(*list)); + if (!list) + goto oom; + list_init(list); + + if (init) + list_move_head(list, init); + + loop = d3dcompiler_alloc(sizeof(*loop)); + if (!loop) + goto oom; + loop->node.type = HLSL_IR_LOOP; + loop->node.loc = *loc; + list_add_tail(list, &loop->node.entry); + loop->body = d3dcompiler_alloc(sizeof(*loop->body)); + if (!loop->body) + goto oom; + list_init(loop->body); + + cond_jump = loop_condition(cond); + if (!cond_jump) + goto oom; + + if (type != LOOP_DO_WHILE) + list_add_tail(loop->body, &cond_jump->node.entry); + + list_move_tail(loop->body, body); + + if (iter) + list_move_tail(loop->body, iter); + + if (type == LOOP_DO_WHILE) + list_add_tail(loop->body, &cond_jump->node.entry); + + d3dcompiler_free(init); + d3dcompiler_free(cond); + d3dcompiler_free(iter); + d3dcompiler_free(body); + return list; + +oom: + ERR("Out of memory.\n"); + if (loop) + d3dcompiler_free(loop->body); + d3dcompiler_free(loop); + d3dcompiler_free(cond_jump); + d3dcompiler_free(list); + free_instr_list(init); + free_instr_list(cond); + free_instr_list(iter); + free_instr_list(body); + return NULL; +} + static unsigned int initializer_size(struct list *initializer) { unsigned int count = 0; @@ -573,6 +697,7 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis %type <list> compound_statement %type <list> jump_statement %type <list> selection_statement +%type <list> loop_statement %type <function> func_declaration %type <function> func_prototype %type <parameter> parameter @@ -1167,6 +1292,7 @@ statement: declaration_statement | compound_statement | jump_statement | selection_statement + | loop_statement /* FIXME: add rule for return with no value */ jump_statement: KW_RETURN expr ';' @@ -1227,6 +1353,22 @@ if_body: statement $$.else_instrs = $3; } +loop_statement: KW_WHILE '(' expr ')' statement + { + struct source_location loc; + struct list *cond = d3dcompiler_alloc(sizeof(*cond)); + + if (!cond) + { + ERR("Out of memory.\n"); + return -1; + } + list_init(cond); + list_add_head(cond, &$3->entry); + set_location(&loc, &@1); + $$ = create_loop(LOOP_WHILE, NULL, cond, NULL, $5, &loc); + } + expr_statement: ';' { $$ = d3dcompiler_alloc(sizeof(*$$));

1 0