March 2016 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Removed no longer used argument from exec_source.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 061592a205b031b41aca7404e54f87965ef72d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=061592a205b031b41aca7404e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 24 14:28:08 2016 +0100 jscript: Removed no longer used argument from exec_source. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 687b06c..214d8fe 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2543,7 +2543,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } -HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BOOL from_eval, jsval_t *ret) +HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, jsval_t *ret) { exec_ctx_t *prev_ctx; jsval_t val; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index dd8ed4c..3943c9a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -218,5 +218,5 @@ static inline void exec_addref(exec_ctx_t *ctx) void exec_release(exec_ctx_t*) DECLSPEC_HIDDEN; HRESULT create_exec_ctx(script_ctx_t*,IDispatch*,jsdisp_t*,scope_chain_t*,BOOL,exec_ctx_t**) DECLSPEC_HIDDEN; -HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,BOOL,jsval_t*) DECLSPEC_HIDDEN; +HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index dcddf59..0d30fdb 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -247,7 +247,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->code, function->func_code, FALSE, r); + hres = exec_source(exec_ctx, function->code, function->func_code, r); function->arguments = prev_args; exec_release(exec_ctx); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 03a26302..0755844 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -222,7 +222,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return throw_syntax_error(ctx, hres, NULL); } - hres = exec_source(ctx->exec_ctx, code, &code->global_code, TRUE, r); + hres = exec_source(ctx->exec_ctx, code, &code->global_code, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 9519479..b1d4472 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -110,7 +110,7 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, FALSE, NULL); + hres = exec_source(exec_ctx, code, &code->global_code, NULL); exec_release(exec_ctx); IActiveScriptSite_OnLeaveScript(This->site); @@ -781,7 +781,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, TRUE, &r); + hres = exec_source(exec_ctx, code, &code->global_code, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult);

1 0

Jacek Caban : jscript: Added a few more arguments tests.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 47cf3fe36d4f5a2f83c0d48ee763c256cd6010c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47cf3fe36d4f5a2f83c0d48ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 24 16:39:23 2016 +0100 jscript: Added a few more arguments tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/lang.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 3e60aba..5b1b510 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -194,6 +194,20 @@ ok(testRecFunc.arguments === null, "testRecFunc.arguments = " + testRecFunc.argu testRecFunc(true); ok(testRecFunc.arguments === null, "testRecFunc.arguments = " + testRecFunc.arguments); +function argumentsTest() { + var save = arguments; + with({arguments: 1}) { + ok(arguments === 1, "arguments = " + arguments); + (function() { + ok(argumentsTest.arguments === save, "unexpected argumentsTest.arguments"); + })(); + } + eval('ok(arguments === save, "unexpected arguments");'); + [1,2].sort(function() { + ok(argumentsTest.arguments === save, "unexpected argumentsTest.arguments"); + }); +} + tmp = (function() {1;})(); ok(tmp === undefined, "tmp = " + tmp); tmp = eval("1;");

1 0

Matteo Bruni : d3d10core/tests: Add a test for DXGI_FORMAT_A8_UNORM textures.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: b2dcc1007a4bbcee2fd8016d75f749f5108bc4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2dcc1007a4bbcee2fd8016d7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 23 21:19:12 2016 +0100 d3d10core/tests: Add a test for DXGI_FORMAT_A8_UNORM textures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ba6f22e..dd63a64 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3790,6 +3790,13 @@ static void test_texture(void) 0xffb1c4de, 0xfff0f1f2, 0xfffafdfe, 0xff5a560f, 0xffd5ff00, 0xffc8f99f, 0xffaa00aa, 0xffdd55bb, }; + static const BYTE a8_data[] = + { + 0x00, 0x10, 0x20, 0x30, + 0x40, 0x50, 0x60, 0x70, + 0x80, 0x90, 0xa0, 0xb0, + 0xc0, 0xd0, 0xe0, 0xf0, + }; static const BYTE bc1_data[] = { 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, @@ -3836,6 +3843,8 @@ static void test_texture(void) }; static const struct texture srgb_texture = {4, 4, 1, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, {{srgb_data, 4 * sizeof(*srgb_data)}}}; + static const struct texture a8_texture = {4, 4, 1, DXGI_FORMAT_A8_UNORM, + {{a8_data, 4 * sizeof(*a8_data)}}}; static const struct texture bc1_texture = {8, 8, 1, DXGI_FORMAT_BC1_UNORM, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture = {8, 8, 1, DXGI_FORMAT_BC2_UNORM, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture = {8, 8, 1, DXGI_FORMAT_BC3_UNORM, {{bc3_data, 2 * 16}}}; @@ -3876,6 +3885,13 @@ static void test_texture(void) 0xff708cba, 0xffdee0e2, 0xfff3fbfd, 0xff1a1801, 0xffa9ff00, 0xff93f159, 0xff670067, 0xffb8177f, }; + static const DWORD a8_colors[] = + { + 0x00000000, 0x10000000, 0x20000000, 0x30000000, + 0x40000000, 0x50000000, 0x60000000, 0x70000000, + 0x80000000, 0x90000000, 0xa0000000, 0xb0000000, + 0xc0000000, 0xd0000000, 0xe0000000, 0xf0000000, + }; static const DWORD bc_colors[] = { 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xff00ff00, @@ -3948,6 +3964,7 @@ static void test_texture(void) {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 2.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, level_1_colors}, {&ps_sample, &srgb_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, srgb_colors}, + {&ps_sample, &a8_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, a8_colors}, {&ps_sample_b, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample_b, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, level_1_colors}, {&ps_sample_b, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D10_FLOAT32_MAX, 8.0f, level_1_colors}, @@ -4101,9 +4118,9 @@ static void test_texture(void) draw_quad(&test_context); get_texture_readback(test_context.backbuffer, &rb); - for (x = 0; x < 4; ++x) + for (y = 0; y < 4; ++y) { - for (y = 0; y < 4; ++y) + for (x = 0; x < 4; ++x) { color = get_readback_color(&rb, 80 + x * 160, 60 + y * 120); ok(compare_color(color, test->expected_colors[y * 4 + x], 1),

1 0

Nikolay Sivov : xmllite/writer: Make it possible to use WriteRaw() multiple times.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 4dcbf2b4b235384d860a3ebdd88f182a46dc5a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcbf2b4b235384d860a3ebdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 24 10:41:26 2016 +0300 xmllite/writer: Make it possible to use WriteRaw() multiple times. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 15 ++++++++++++++- dlls/xmllite/writer.c | 18 +++++++++++------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 7a958b3..b4d7102 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -863,6 +863,7 @@ static void test_WriteCData(void) static void test_WriteRaw(void) { static const WCHAR rawW[] = {'a','<',':',0}; + static const WCHAR aW[] = {'a',0}; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -884,6 +885,18 @@ static void test_WriteRaw(void) hr = IXmlWriter_WriteRaw(writer, rawW); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteRaw(writer, rawW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteComment(writer, rawW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteRaw(writer, rawW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); @@ -899,7 +912,7 @@ static void test_WriteRaw(void) hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "got 0x%08x\n", hr); - CHECK_OUTPUT(stream, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>a<:"); + CHECK_OUTPUT(stream, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>a<:a<:a<:<a>a</a>"); IXmlWriter_Release(writer); IStream_Release(stream); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 61190c6..65d0bcc 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -767,10 +767,13 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr case XmlWriterState_ElemStarted: writer_close_starttag(This); break; - case XmlWriterState_DocClosed: - return WR_E_INVALIDACTION; + case XmlWriterState_Ready: + case XmlWriterState_DocStarted: + case XmlWriterState_PIDocStarted: + break; default: - ; + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; } write_encoding_bom(This); @@ -1043,11 +1046,11 @@ static HRESULT WINAPI xmlwriter_WriteRaw(IXmlWriter *iface, LPCWSTR data) case XmlWriterState_PIDocStarted: break; default: + This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; } write_output_buffer(This->output, data, -1); - This->state = XmlWriterState_DocClosed; return S_OK; } @@ -1086,6 +1089,7 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal case XmlWriterState_Ready: break; default: + This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; } @@ -1099,6 +1103,9 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre TRACE("(%p)->(%s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri)); + if (!local_name) + return E_INVALIDARG; + switch (This->state) { case XmlWriterState_Initial: @@ -1109,9 +1116,6 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre ; } - if (!local_name) - return E_INVALIDARG; - /* close pending element */ if (This->starttagopen) write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW));

1 0

Matteo Bruni : wined3d: Emulate luminance texture formats on core profile.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 565ef4f961a8ebec7bb3cf7bd8802f3c0902ec43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=565ef4f961a8ebec7bb3cf7bd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 23 21:19:08 2016 +0100 wined3d: Emulate luminance texture formats on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 81 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 68 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=565ef4f961a8ebec7bb3c…

1 0

Henri Verbeet : dxgi: Simplify the shader model comparison in dxgi_check_feature_level_support( ).
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 73da1b951d851b1d7fd52685061166fc8362d07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=73da1b951d851b1d7fd526850… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 23 17:58:19 2016 +0100 dxgi: Simplify the shader model comparison in dxgi_check_feature_level_support(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/utils.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index cd8888f..c0c1fcd 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -491,6 +491,7 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, {D3D_FEATURE_LEVEL_9_1, 2}, }; D3D_FEATURE_LEVEL selected_feature_level = 0; + unsigned int shader_model; unsigned int i, j; WINED3DCAPS caps; HRESULT hr; @@ -504,14 +505,14 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, if (FAILED(hr)) level_count = 0; + shader_model = min(caps.VertexShaderVersion, caps.PixelShaderVersion); for (i = 0; i < level_count; ++i) { for (j = 0; j < sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0]); ++j) { if (feature_levels[i] == feature_levels_sm[j].feature_level) { - if (caps.VertexShaderVersion >= feature_levels_sm[j].sm - && caps.PixelShaderVersion >= feature_levels_sm[j].sm) + if (shader_model >= feature_levels_sm[j].sm) { selected_feature_level = feature_levels[i]; TRACE("Choosing supported feature level %s (SM%u).\n",

1 0

Henri Verbeet : d3d11: Use %#x for tracing the feature level in layer_set_feature_level().
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 16afe47b9d141aa1e61044a440e3cc2edb9d48fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=16afe47b9d141aa1e61044a44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 23 17:58:20 2016 +0100 d3d11: Use %#x for tracing the feature level in layer_set_feature_level(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index ebd4808..3c21037 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -106,7 +106,7 @@ static void WINAPI layer_set_feature_level(enum dxgi_device_layer_id id, void *d { struct d3d_device *d3d_device = device; - TRACE("id %#x, device %p, feature_level %u.\n", id, device, feature_level); + TRACE("id %#x, device %p, feature_level %#x.\n", id, device, feature_level); if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE) {

1 0

Henri Verbeet : wined3d: Get the framebuffer height from the view in shader_glsl_load_constants().
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 72e373d22000c2207b0140df71377858edb4db93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e373d22000c2207b0140df7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 23 17:58:21 2016 +0100 wined3d: Get the framebuffer height from the view in shader_glsl_load_constants(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 11f103e..8892d49 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1430,16 +1430,16 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context if (update_mask & WINED3D_SHADER_CONST_PS_Y_CORR) { - float correction_params[] = + const struct wined3d_vec4 correction_params = { - /* position is window relative, not viewport relative */ - context->render_offscreen ? 0.0f : (float)context->current_rt->resource.height, + /* Position is relative to the framebuffer, not the viewport. */ + context->render_offscreen ? 0.0f : (float)state->fb->render_targets[0]->height, context->render_offscreen ? 1.0f : -1.0f, 0.0f, 0.0f, }; - GL_EXTCALL(glUniform4fv(prog->ps.ycorrection_location, 1, correction_params)); + GL_EXTCALL(glUniform4fv(prog->ps.ycorrection_location, 1, &correction_params.x)); } if (update_mask & WINED3D_SHADER_CONST_PS_NP2_FIXUP)

1 0

Henri Verbeet : wined3d: Pass a texture instead of a surface to context_create().
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 7bf2a3452880dd5d47287d00d1836d29abfcb9ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf2a3452880dd5d47287d00d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 23 17:58:22 2016 +0100 wined3d: Pass a texture instead of a surface to context_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/device.c | 6 ++---- dlls/wined3d/swapchain.c | 6 ++---- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 31fd22a..0d6ba69 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1559,7 +1559,7 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, } struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, - struct wined3d_surface *target, const struct wined3d_format *ds_format) + struct wined3d_texture *target, const struct wined3d_format *ds_format) { struct wined3d_device *device = swapchain->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; @@ -1659,7 +1659,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } } - color_format = target->container->resource.format; + color_format = target->resource.format; /* In case of ORM_BACKBUFFER, make sure to request an alpha component for * X4R4G4B4/X8R8G8B8 as we might need it for the backbuffer. */ @@ -1771,10 +1771,10 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } ret->swapchain = swapchain; - ret->current_rt = target; + ret->current_rt = target->sub_resources[0].u.surface; ret->tid = GetCurrentThreadId(); - ret->render_offscreen = wined3d_resource_is_offscreen(&target->container->resource); + ret->render_offscreen = wined3d_resource_is_offscreen(&target->resource); ret->draw_buffers_mask = context_generate_rt_mask(GL_BACK); ret->valid = 1; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a523d3..dbfa86c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4554,7 +4554,7 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { struct wined3d_context *context; - struct wined3d_surface *target; + struct wined3d_texture *target; HRESULT hr; if (FAILED(hr = device->shader_backend->shader_alloc_private(device, @@ -4581,9 +4581,7 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru return E_OUTOFMEMORY; } - target = swapchain->back_buffers - ? surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)) - : surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)); + target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; if (!(context = context_create(swapchain, target, swapchain->ds_format))) { WARN("Failed to create context.\n"); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7d02375..c2883bb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -983,7 +983,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 for (i = 0; i < (sizeof(formats) / sizeof(*formats)); i++) { swapchain->ds_format = wined3d_get_format(gl_info, formats[i]); - swapchain->context[0] = context_create(swapchain, front_buffer, swapchain->ds_format); + swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format); if (swapchain->context[0]) break; TRACE("Depth stencil format %s is not supported, trying next format\n", debug_d3dformat(formats[i])); @@ -1145,9 +1145,7 @@ static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain TRACE("Creating a new context for swapchain %p, thread %u.\n", swapchain, GetCurrentThreadId()); - if (!(ctx = context_create(swapchain, - surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)), - swapchain->ds_format))) + if (!(ctx = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format))) { ERR("Failed to create a new context for the swapchain\n"); return NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9e83e6a..c638c45 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1515,7 +1515,7 @@ void context_active_texture(struct wined3d_context *context, const struct wined3 unsigned int unit) DECLSPEC_HIDDEN; void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) DECLSPEC_HIDDEN; void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; -struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_surface *target, +struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; void context_destroy(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Introduce wined3d_texture_get_gl_buffer().
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: b46ef08c9cd434d71206a0444f1f7040f02400cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46ef08c9cd434d71206a0444… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 23 17:58:23 2016 +0100 wined3d: Introduce wined3d_texture_get_gl_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/surface.c | 44 ++++++------------------------------------ dlls/wined3d/texture.c | 32 ++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0d6ba69..d28ebd3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -337,7 +337,7 @@ static inline DWORD context_generate_rt_mask(GLenum buffer) static inline DWORD context_generate_rt_mask_from_surface(const struct wined3d_surface *target) { - return (1u << 31) | surface_get_gl_buffer(target); + return (1u << 31) | wined3d_texture_get_gl_buffer(target->container); } static inline void context_set_fbo_key_for_surface(const struct wined3d_context *context, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b86cb72..ceea4fe 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -698,7 +698,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, if (src_location == WINED3D_LOCATION_DRAWABLE) { TRACE("Source surface %p is onscreen.\n", src_surface); - buffer = surface_get_gl_buffer(src_surface); + buffer = wined3d_texture_get_gl_buffer(src_surface->container); surface_translate_drawable_coords(src_surface, context->win_handle, &src_rect); } else @@ -715,7 +715,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, if (dst_location == WINED3D_LOCATION_DRAWABLE) { TRACE("Destination surface %p is onscreen.\n", dst_surface); - buffer = surface_get_gl_buffer(dst_surface); + buffer = wined3d_texture_get_gl_buffer(dst_surface->container); surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); } else @@ -1444,38 +1444,6 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const checkGLcall("set_compatible_renderbuffer"); } -GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) -{ - const struct wined3d_swapchain *swapchain = surface->container->swapchain; - - TRACE("surface %p.\n", surface); - - if (!swapchain) - { - ERR("Surface %p is not on a swapchain.\n", surface); - return GL_NONE; - } - - if (swapchain->back_buffers && swapchain->back_buffers[0] == surface->container) - { - if (swapchain->render_to_fbo) - { - TRACE("Returning GL_COLOR_ATTACHMENT0\n"); - return GL_COLOR_ATTACHMENT0; - } - TRACE("Returning GL_BACK\n"); - return GL_BACK; - } - else if (surface->container == swapchain->front_buffer) - { - TRACE("Returning GL_FRONT\n"); - return GL_FRONT; - } - - FIXME("Higher back buffer, returning GL_BACK\n"); - return GL_BACK; -} - /* Context activation is done by the caller. */ void surface_load(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { @@ -1913,7 +1881,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, else { /* Onscreen surfaces are always part of a swapchain */ - GLenum buffer = surface_get_gl_buffer(surface); + GLenum buffer = wined3d_texture_get_gl_buffer(texture); TRACE("Mapping %#x buffer.\n", buffer); gl_info->gl_ops.gl.p_glReadBuffer(buffer); checkGLcall("glReadBuffer"); @@ -2016,7 +1984,7 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct if (wined3d_resource_is_offscreen(&texture->resource)) gl_info->gl_ops.gl.p_glReadBuffer(context_get_offscreen_gl_buffer(context)); else - gl_info->gl_ops.gl.p_glReadBuffer(surface_get_gl_buffer(surface)); + gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(texture)); checkGLcall("glReadBuffer"); gl_info->gl_ops.gl.p_glCopyTexSubImage2D(surface->texture_target, surface->texture_level, @@ -2127,7 +2095,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc } else { - gl_info->gl_ops.gl.p_glReadBuffer(surface_get_gl_buffer(src_surface)); + gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(src_texture)); } checkGLcall("glReadBuffer"); @@ -2291,7 +2259,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st } else { - gl_info->gl_ops.gl.p_glReadBuffer(surface_get_gl_buffer(src_surface)); + gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(src_texture)); } /* TODO: Only back up the part that will be overwritten */ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2687bf1..feb6919 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -37,6 +37,38 @@ BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED)); } +GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) +{ + const struct wined3d_swapchain *swapchain = texture->swapchain; + + TRACE("texture %p.\n", texture); + + if (!swapchain) + { + ERR("Texture %p is not part of a swapchain.\n", texture); + return GL_NONE; + } + + if (swapchain->back_buffers && swapchain->back_buffers[0] == texture) + { + if (swapchain->render_to_fbo) + { + TRACE("Returning GL_COLOR_ATTACHMENT0.\n"); + return GL_COLOR_ATTACHMENT0; + } + TRACE("Returning GL_BACK.\n"); + return GL_BACK; + } + else if (texture == swapchain->front_buffer) + { + TRACE("Returning GL_FRONT.\n"); + return GL_FRONT; + } + + FIXME("Higher back buffer, returning GL_BACK.\n"); + return GL_BACK; +} + static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_texture_ops *texture_ops, UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c638c45..a9d2a96 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2453,6 +2453,7 @@ void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; BOOL wined3d_texture_check_block_align(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; +GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, UINT sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, @@ -2605,7 +2606,6 @@ void wined3d_surface_cleanup(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; HRESULT surface_create_dib_section(struct wined3d_surface *surface) DECLSPEC_HIDDEN; -GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; HRESULT wined3d_surface_init(struct wined3d_surface *surface,

1 0