wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Alexandre Julliard : glu32: Implement gluCheckExtension.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 2bc75f1ab2efeb832f907a1ebe2ed51c2f5c2d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc75f1ab2efeb832f907a1eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 6 15:18:37 2017 +0200 glu32: Implement gluCheckExtension. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/glu.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 8bf19f9..eaf04d5 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -74,6 +74,9 @@ typedef struct { #define GLU_TESS_EDGE_FLAG_DATA 100110 #define GLU_TESS_COMBINE_DATA 100111 +#define GLU_TRUE GL_TRUE +#define GLU_FALSE GL_FALSE + static void (*p_gluBeginCurve)( GLUnurbs* nurb ); static void (*p_gluBeginSurface)( GLUnurbs* nurb ); static void (*p_gluBeginTrim)( GLUnurbs* nurb ); @@ -523,7 +526,17 @@ const GLubyte * WINAPI wine_gluGetString( GLenum name ) */ GLboolean WINAPI wine_gluCheckExtension( const GLubyte *extName, const GLubyte *extString ) { - return 0; + const char *list = (const char *)extString; + const char *ext = (const char *)extName; + size_t len = strlen( ext ); + + while (list) + { + while (*list == ' ') list++; + if (!strncmp( list, ext, len ) && (!list[len] || list[len] == ' ')) return GLU_TRUE; + list = strchr( list, ' ' ); + } + return GLU_FALSE; } /***********************************************************************

1 0

Alexandre Julliard : glu32: Implement gluGetTessProperty.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 8b1fe34acb3d707850cd8e4a602b3eece3291286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b1fe34acb3d707850cd8e4a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 6 13:51:42 2017 +0200 glu32: Implement gluGetTessProperty. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/glu.c | 9 +++++++++ dlls/glu32/glu32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index ee2468b..8bf19f9 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -90,6 +90,7 @@ static void (*p_gluEndTrim)( GLUnurbs* nurb ); static const GLubyte * (*p_gluErrorString)( GLenum error ); static void (*p_gluGetNurbsProperty)( GLUnurbs* nurb, GLenum property, GLfloat* data ); static const GLubyte * (*p_gluGetString)( GLenum name ); +static void (*p_gluGetTessProperty)( GLUtesselator* tess, GLenum which, GLdouble* data ); static void (*p_gluLoadSamplingMatrices)( GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view ); static void (*p_gluLookAt)( GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ ); static GLUnurbs* (*p_gluNewNurbsRenderer)(void); @@ -149,6 +150,7 @@ static BOOL load_libglu(void) LOAD_FUNCPTR(gluErrorString); LOAD_FUNCPTR(gluGetNurbsProperty); LOAD_FUNCPTR(gluGetString); + LOAD_FUNCPTR(gluGetTessProperty); LOAD_FUNCPTR(gluLoadSamplingMatrices); LOAD_FUNCPTR(gluLookAt); LOAD_FUNCPTR(gluNewNurbsRenderer); @@ -716,6 +718,13 @@ void WINAPI wine_gluTessVertex( wine_GLUtesselator *tess, GLdouble coords[3], vo p_gluTessVertex( tess->tess, coords, data ); } +/*********************************************************************** + * gluGetTessProperty (GLU32.@) + */ +void WINAPI wine_gluGetTessProperty( wine_GLUtesselator *tess, GLenum which, GLdouble *value ) +{ + p_gluGetTessProperty( tess->tess, which, value ); +} /*********************************************************************** * gluTessProperty (GLU32.@) diff --git a/dlls/glu32/glu32.spec b/dlls/glu32/glu32.spec index 2266bd0..8f98fec 100644 --- a/dlls/glu32/glu32.spec +++ b/dlls/glu32/glu32.spec @@ -18,7 +18,7 @@ @ stub gluErrorUnicodeStringEXT @ stdcall gluGetNurbsProperty(ptr long ptr) wine_gluGetNurbsProperty @ stdcall gluGetString(long) wine_gluGetString -@ stub gluGetTessProperty +@ stdcall gluGetTessProperty(ptr long ptr) wine_gluGetTessProperty @ stdcall gluLoadSamplingMatrices(ptr ptr ptr ptr) wine_gluLoadSamplingMatrices @ stdcall gluLookAt(double double double double double double double double double) wine_gluLookAt @ stdcall gluNewNurbsRenderer() wine_gluNewNurbsRenderer

1 0

Alexandre Julliard : glu32: Use the correct data types.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 488bdbaf19daf84216e979f58b82e1197eee105c URL: http://source.winehq.org/git/wine.git/?a=commit;h=488bdbaf19daf84216e979f58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 6 13:48:07 2017 +0200 glu32: Use the correct data types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/glu.c | 445 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 249 insertions(+), 196 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=488bdbaf19daf84216e97…

1 0

Alexandre Julliard : glu32: Load libGLU dynamically.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 3558acac7280323145966387a43ef5efd9908317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3558acac7280323145966387a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 6 12:57:29 2017 +0200 glu32: Load libGLU dynamically. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 45 +++++--- configure.ac | 6 +- dlls/glu32/Makefile.in | 2 - dlls/glu32/glu.c | 287 +++++++++++++++++++++++++++++++------------------ include/config.h.in | 3 + 5 files changed, 220 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3558acac7280323145966…

1 0

Józef Kucia : wined3d: Support SV_RenderTargetArrayIndex semantic for pixel shader inputs.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: acb480e7e487259afe7798e9cb6c40ca3cb26e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb480e7e487259afe7798e9c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 6 11:47:53 2017 +0200 wined3d: Support SV_RenderTargetArrayIndex semantic for pixel shader inputs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 10 ++++++++++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 13 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0d5a476..f434157 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -126,6 +126,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_ES3_compatibility", ARB_ES3_COMPATIBILITY }, {"GL_ARB_explicit_attrib_location", ARB_EXPLICIT_ATTRIB_LOCATION }, {"GL_ARB_fragment_coord_conventions", ARB_FRAGMENT_COORD_CONVENTIONS}, + {"GL_ARB_fragment_layer_viewport", ARB_FRAGMENT_LAYER_VIEWPORT }, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER }, {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT }, @@ -3845,6 +3846,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_COMPUTE_SHADER, MAKEDWORD_VERSION(4, 3)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, + {ARB_FRAGMENT_LAYER_VIEWPORT, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_STORAGE_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 21f543c..c8a970f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6444,6 +6444,14 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w "uintBitsToFloat(gl_FrontFacing ? 0xffffffffu : 0u), 0.0, 0.0, 0.0);\n", input->register_idx); } + else if (input->sysval_semantic == WINED3D_SV_RENDER_TARGET_ARRAY_INDEX && !semantic_idx) + { + if (gl_info->supported[ARB_FRAGMENT_LAYER_VIEWPORT]) + shader_addline(buffer, "ps_in[%u]%s = intBitsToFloat(gl_Layer);\n", + input->register_idx, reg_mask); + else + FIXME("ARB_fragment_layer_viewport is not supported.\n"); + } else { if (input->sysval_semantic) @@ -7051,6 +7059,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "#extension GL_ARB_derivative_control : enable\n"); if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) shader_addline(buffer, "#extension GL_ARB_fragment_coord_conventions : enable\n"); + if (gl_info->supported[ARB_FRAGMENT_LAYER_VIEWPORT]) + shader_addline(buffer, "#extension GL_ARB_fragment_layer_viewport : enable\n"); if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) shader_addline(buffer, "#extension GL_ARB_shader_texture_lod : enable\n"); /* The spec says that it doesn't have to be explicitly enabled, but the diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 6290032..4960fc7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -59,6 +59,7 @@ enum wined3d_gl_extension ARB_ES3_COMPATIBILITY, ARB_EXPLICIT_ATTRIB_LOCATION, ARB_FRAGMENT_COORD_CONVENTIONS, + ARB_FRAGMENT_LAYER_VIEWPORT, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, ARB_FRAMEBUFFER_OBJECT,

1 0

Andrew Wesie : wined3d: Support render target array index semantic value.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: e5d3908ffa0515e31005ab355b50c42cf73f689a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d3908ffa0515e31005ab355… Author: Andrew Wesie <awesie(a)gmail.com> Date: Thu Apr 6 11:47:52 2017 +0200 wined3d: Support render target array index semantic value. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b112f14..21f543c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6724,6 +6724,11 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv shader_addline(buffer, "gl_PointSize = clamp(shader_out[%u].%c, " "ffp_point.size_min, ffp_point.size_max);\n", output->register_idx, reg_mask[1]); } + else if (output->sysval_semantic == WINED3D_SV_RENDER_TARGET_ARRAY_INDEX && !semantic_idx) + { + shader_addline(buffer, "gl_Layer = floatBitsToInt(shader_out[%u])%s;\n", + output->register_idx, reg_mask); + } else if (output->sysval_semantic) { FIXME("Unhandled sysval semantic %#x.\n", output->sysval_semantic);

1 0

Józef Kucia : wined3d: Add basic support for rendering to 3D textures.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: f424a77375e71af0c6f3a8e40351426d3f354582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f424a77375e71af0c6f3a8e40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 6 11:47:51 2017 +0200 wined3d: Add basic support for rendering to 3D textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 132 +++++++++++++++++++++++------------------ dlls/wined3d/directx.c | 5 ++ dlls/wined3d/wined3d_private.h | 8 ++- 3 files changed, 83 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f424a77375e71af0c6f3a…

1 0

Józef Kucia : wined3d: Store render target info instead of surfaces in "blit_targets".
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 26b7baa0dd5c5e511231c0022a9ff495459d0458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b7baa0dd5c5e511231c0022… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 6 11:47:50 2017 +0200 wined3d: Store render target info instead of surfaces in "blit_targets". In preparation for extending render target views support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 112 ++++++++++++++++++++++++++++------------- dlls/wined3d/surface.c | 21 ++++++-- dlls/wined3d/wined3d_private.h | 12 ++++- 3 files changed, 102 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26b7baa0dd5c5e511231c…

1 0

Józef Kucia : wined3d: Add support for cube shadow samplers.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 90bf175f4d9685c4d2c70e35c8f1efe0d71478aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=90bf175f4d9685c4d2c70e35c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 6 11:47:49 2017 +0200 wined3d: Add support for cube shadow samplers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3a84a43..b112f14 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2396,8 +2396,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: if (shadow_sampler) - FIXME("Unsupported Cube shadow sampler.\n"); - sampler_type = "samplerCube"; + sampler_type = "samplerCubeShadow"; + else + sampler_type = "samplerCube"; break; case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: @@ -2409,8 +2410,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont case WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY: if (shadow_sampler) - FIXME("Unsupported Cube array shadow sampler.\n"); - sampler_type = "samplerCubeArray"; + sampler_type = "samplerCubeArrayShadow"; + else + sampler_type = "samplerCubeArray"; break; default:

1 0

Józef Kucia : d3d11/tests: Use SM5 geometry shader in test_geometry_shader() if possible.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: ecd64a72465bc32a2febb73dac26463c632f9711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd64a72465bc32a2febb73da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 6 11:47:48 2017 +0200 d3d11/tests: Use SM5 geometry shader in test_geometry_shader() if possible. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2c31490..94fd367 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15967,6 +15967,38 @@ void main(point struct gs_data vin[1], inout TriangleStream<gs_data> vout) 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x01000013, 0x0100003e, }; + static const DWORD gs_5_0_code[] = + { + 0x43425844, 0x57251c23, 0x4971d115, 0x8fee0b13, 0xba149ea1, 0x00000001, 0x00000384, 0x00000003, + 0x0000002c, 0x00000080, 0x000000dc, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x3547534f, 0x00000054, 0x00000002, 0x00000008, 0x00000000, 0x00000040, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x00000000, 0x0000004c, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x58454853, + 0x000002a0, 0x00020050, 0x000000a8, 0x0100086a, 0x05000061, 0x002010f2, 0x00000001, 0x00000000, + 0x00000001, 0x0400005f, 0x002010f2, 0x00000001, 0x00000001, 0x02000068, 0x00000001, 0x0100085d, + 0x0300008f, 0x00110000, 0x00000000, 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000001, 0x0200005e, 0x00000004, 0x0f000032, 0x00100032, 0x00000000, + 0x80201ff6, 0x00000041, 0x00000000, 0x00000000, 0x00004002, 0x3e4ccccd, 0x3e4ccccd, 0x00000000, + 0x00000000, 0x00201046, 0x00000000, 0x00000000, 0x05000036, 0x00102032, 0x00000000, 0x00100046, + 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, 0x00000000, 0x05000036, + 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, + 0x00000000, 0x00000001, 0x03000075, 0x00110000, 0x00000000, 0x05000036, 0x00102012, 0x00000000, + 0x0010000a, 0x00000000, 0x0e000032, 0x00100052, 0x00000000, 0x00201ff6, 0x00000000, 0x00000000, + 0x00004002, 0x3e4ccccd, 0x00000000, 0x3e4ccccd, 0x00000000, 0x00201106, 0x00000000, 0x00000000, + 0x05000036, 0x00102022, 0x00000000, 0x0010002a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, + 0x0020102a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, + 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x03000075, 0x00110000, + 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022, + 0x00000000, 0x0010001a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, + 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, + 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x03000075, 0x00110000, 0x00000000, 0x05000036, + 0x00102032, 0x00000000, 0x00100086, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, + 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, + 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x03000075, 0x00110000, 0x00000000, + 0x0100003e, + }; #if 0 struct ps_data { @@ -16018,7 +16050,10 @@ float4 main(struct ps_data ps_input) : SV_Target hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); - hr = ID3D11Device_CreateGeometryShader(device, gs_code, sizeof(gs_code), NULL, &gs); + if (ID3D11Device_GetFeatureLevel(device) >= D3D_FEATURE_LEVEL_11_0) + hr = ID3D11Device_CreateGeometryShader(device, gs_5_0_code, sizeof(gs_5_0_code), NULL, &gs); + else + hr = ID3D11Device_CreateGeometryShader(device, gs_code, sizeof(gs_code), NULL, &gs); ok(SUCCEEDED(hr), "Failed to create geometry shader, hr %#x.\n", hr); hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr);

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
76
Older →

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 April 2017