wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 0128e1a18f25848e6f47146580a8f0db69687dd6.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-04-10 22:39:05 +02:00
parent d06996cabd
commit fbc61357d3
6 changed files with 67 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/wined3d-1DTextures/0012-wined3d-Generate-glsl-samplers-for-1d-texture-arrays.patch
View File

@@ -1,4 +1,4 @@
From d899bbed65bd73ee3c18a55bda617b96d19c126e Mon Sep 17 00:00:00 2001
From 82eb096a5585a8baaf2258943229b3a001d1bdb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 25 Aug 2016 17:06:41 +0200
Subject: wined3d: Generate glsl samplers for 1d texture arrays.
@@ -8,11 +8,11 @@ Subject: wined3d: Generate glsl samplers for 1d texture arrays.
1 file changed, 7 insertions(+)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 5ccb027..654a988 100644
index c8a970f1eb..1a25701cb9 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2005,6 +2005,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
sampler_type = "samplerCube";
@@ -2401,6 +2401,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont
sampler_type = "samplerCube";
break;
+ case WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY:
@@ -26,5 +26,5 @@ index 5ccb027..654a988 100644
if (shadow_sampler)
sampler_type = "sampler2DArrayShadow";
--
2.8.1
2.11.0

16
patches/wined3d-1DTextures/0013-wined3d-Add-support-for-1d-textures-in-context_attac.patch
View File

@@ -1,4 +1,4 @@
From 628042ee68362bf3d57801084143e9e7d724b262 Mon Sep 17 00:00:00 2001
From 05249b5d5e76a7b5badf6daf22865712a36e39bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 25 Aug 2016 19:09:41 +0200
Subject: wined3d: Add support for 1d textures in
@@ -9,21 +9,21 @@ Subject: wined3d: Add support for 1d textures in
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 74c3a49..1cd2463 100644
index 239dc38fa9..bc450e5249 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -128,7 +128,7 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context,
@@ -127,7 +127,7 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context,
{
gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, attachment, GL_TEXTURE_2D, 0, 0);
checkGLcall("glFramebufferTexture2D()");
}
- else if (resource->target == GL_TEXTURE_2D_ARRAY)
+ else if (resource->target == GL_TEXTURE_2D_ARRAY || resource->target == GL_TEXTURE_1D_ARRAY)
{
if (!gl_info->fbo_ops.glFramebufferTextureLayer)
{
@@ -140,6 +140,12 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context,
resource->object, resource->level, resource->layer);
checkGLcall("glFramebufferTextureLayer()");
@@ -149,6 +149,12 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context,
gl_info->fbo_ops.glFramebufferTexture(fbo_target, attachment,
resource->object, resource->level);
}
+ else if (resource->target == GL_TEXTURE_1D)
+ {
@@ -35,5 +35,5 @@ index 74c3a49..1cd2463 100644
{
gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, attachment,
--
2.8.1
2.11.0