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 692656467729c5548c45244aa05ca946620afa72.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-04-12 07:03:43 +02:00
parent e5d2247213
commit b113596b6c
5 changed files with 198 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,29 +1,30 @@
From 05249b5d5e76a7b5badf6daf22865712a36e39bb Mon Sep 17 00:00:00 2001
From 297e02795ff39b1ee67bca1e54d93867ba151fd6 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
context_attach_gl_texture_fbo.
---
dlls/wined3d/context.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
dlls/wined3d/context.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 239dc38fa9..bc450e5249 100644
index 09681834d9..598622d3e7 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -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);
@@ -139,7 +139,8 @@ 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_2D_ARRAY)
+ else if (resource->target == GL_TEXTURE_2D_ARRAY || resource->target == GL_TEXTURE_1D_ARRAY)
- else if (resource->target == GL_TEXTURE_2D_ARRAY || resource->target == GL_TEXTURE_3D)
+ else if (resource->target == GL_TEXTURE_1D_ARRAY || resource->target == GL_TEXTURE_2D_ARRAY ||
+ resource->target == GL_TEXTURE_3D)
{
if (!gl_info->fbo_ops.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);
@@ -150,6 +151,12 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context,
gl_info->fbo_ops.glFramebufferTextureLayer(fbo_target, attachment,
resource->object, resource->level, resource->layer);
}
+ else if (resource->target == GL_TEXTURE_1D)
+ {