[pkg-wine-party] [wine] 253/254: Add patch to drop new ARB_texture_filter_anisotropic extension.
Jens Reyer
jreyer-guest at moszumanska.debian.org
Fri Oct 13 19:29:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
jreyer-guest pushed a commit to branch master
in repository wine.
commit 080c49e6d2fb28d9607c0c9da0a698fb2f7bab6d
Author: Jens Reyer <jre.winesim at gmail.com>
Date: Fri Oct 13 11:01:49 2017 +0200
Add patch to drop new ARB_texture_filter_anisotropic extension.
This was added upstream as part of OpenGL 4.6, which we don't
have yet, therefore Wine ftbfs with it. So revert the upstream
change for now.
---
debian/patches/revert_opengl46.patch | 116 +++++++++++++++++++++++++++++++++++
debian/patches/series | 2 +
2 files changed, 118 insertions(+)
diff --git a/debian/patches/revert_opengl46.patch b/debian/patches/revert_opengl46.patch
new file mode 100644
index 0000000..d861311
--- /dev/null
+++ b/debian/patches/revert_opengl46.patch
@@ -0,0 +1,116 @@
+Description: Drop new ARB_texture_filter_anisotropic extension.
+ This was added upstream as part of OpenGL 4.6, which we don't have yet,
+ therefore Wine ftbfs with it. So revert the upstream change for now.
+Origin: https://source.winehq.org/git/wine.git/commitdiff/5b7a6d424eefb5261049f60473d6c94099a89722
+Forwarded: not-needed
+
+--- a/dlls/wined3d/directx.c
++++ b/dlls/wined3d/directx.c
+@@ -175,7 +175,6 @@ static const struct wined3d_extension_ma
+ {"GL_ARB_texture_cube_map_array", ARB_TEXTURE_CUBE_MAP_ARRAY },
+ {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE },
+ {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 },
+- {"GL_ARB_texture_filter_anisotropic", ARB_TEXTURE_FILTER_ANISOTROPIC},
+ {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT },
+ {"GL_ARB_texture_gather", ARB_TEXTURE_GATHER },
+ {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT },
+@@ -234,7 +233,7 @@ static const struct wined3d_extension_ma
+ {"GL_EXT_texture_compression_s3tc", EXT_TEXTURE_COMPRESSION_S3TC },
+ {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE },
+ {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3 },
+- {"GL_EXT_texture_filter_anisotropic", ARB_TEXTURE_FILTER_ANISOTROPIC},
++ {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC},
+ {"GL_EXT_texture_integer", EXT_TEXTURE_INTEGER },
+ {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS },
+ {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP },
+@@ -3596,9 +3595,9 @@ static void wined3d_adapter_init_limits(
+ gl_info->limits.texture3d_size = gl_max;
+ TRACE("Max texture3D size: %d.\n", gl_info->limits.texture3d_size);
+ }
+- if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC])
++ if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC])
+ {
+- gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY, &gl_max);
++ gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &gl_max);
+ gl_info->limits.anisotropy = gl_max;
+ TRACE("Max anisotropy: %d.\n", gl_info->limits.anisotropy);
+ }
+@@ -3905,7 +3904,6 @@ static BOOL wined3d_adapter_init_gl_caps
+ {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)},
+
+ {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)},
+- {ARB_TEXTURE_FILTER_ANISOTROPIC, MAKEDWORD_VERSION(4, 6)},
+ };
+ struct wined3d_driver_info *driver_info = &adapter->driver_info;
+ const char *gl_vendor_str, *gl_renderer_str, *gl_version_str;
+@@ -5635,7 +5633,7 @@ HRESULT CDECL wined3d_get_device_caps(co
+ WINED3DPRASTERCAPS_SLOPESCALEDEPTHBIAS |
+ WINED3DPRASTERCAPS_DEPTHBIAS;
+
+- if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC])
++ if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC])
+ {
+ caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY |
+ WINED3DPRASTERCAPS_ZBIAS |
+@@ -5754,7 +5752,7 @@ HRESULT CDECL wined3d_get_device_caps(co
+ WINED3DPTFILTERCAPS_MIPNEAREST |
+ WINED3DPTFILTERCAPS_NEAREST;
+
+- if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC])
++ if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC])
+ {
+ caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC |
+ WINED3DPTFILTERCAPS_MINFANISOTROPIC;
+@@ -5775,7 +5773,7 @@ HRESULT CDECL wined3d_get_device_caps(co
+ WINED3DPTFILTERCAPS_MIPNEAREST |
+ WINED3DPTFILTERCAPS_NEAREST;
+
+- if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC])
++ if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC])
+ {
+ caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC |
+ WINED3DPTFILTERCAPS_MINFANISOTROPIC;
+--- a/dlls/wined3d/sampler.c
++++ b/dlls/wined3d/sampler.c
+@@ -98,8 +98,8 @@ static void wined3d_sampler_cs_init(void
+ GL_EXTCALL(glSamplerParameterf(sampler->name, GL_TEXTURE_LOD_BIAS, desc->lod_bias));
+ GL_EXTCALL(glSamplerParameterf(sampler->name, GL_TEXTURE_MIN_LOD, desc->min_lod));
+ GL_EXTCALL(glSamplerParameterf(sampler->name, GL_TEXTURE_MAX_LOD, desc->max_lod));
+- if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC])
+- GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_MAX_ANISOTROPY, desc->max_anisotropy));
++ if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC])
++ GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_MAX_ANISOTROPY_EXT, desc->max_anisotropy));
+ if (desc->compare)
+ GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE));
+ GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_COMPARE_FUNC,
+--- a/dlls/wined3d/texture.c
++++ b/dlls/wined3d/texture.c
+@@ -851,8 +851,8 @@ void wined3d_texture_apply_sampler_desc(
+ state = sampler_desc->max_anisotropy;
+ if (state != gl_tex->sampler_desc.max_anisotropy)
+ {
+- if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC])
+- gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY, state);
++ if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC])
++ gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, state);
+ else
+ WARN("Anisotropic filtering not supported.\n");
+ gl_tex->sampler_desc.max_anisotropy = state;
+--- a/dlls/wined3d/wined3d_gl.h
++++ b/dlls/wined3d/wined3d_gl.h
+@@ -109,7 +109,6 @@ enum wined3d_gl_extension
+ ARB_TEXTURE_CUBE_MAP_ARRAY,
+ ARB_TEXTURE_ENV_COMBINE,
+ ARB_TEXTURE_ENV_DOT3,
+- ARB_TEXTURE_FILTER_ANISOTROPIC,
+ ARB_TEXTURE_FLOAT,
+ ARB_TEXTURE_GATHER,
+ ARB_TEXTURE_MIRRORED_REPEAT,
+@@ -166,6 +165,7 @@ enum wined3d_gl_extension
+ EXT_TEXTURE_COMPRESSION_S3TC,
+ EXT_TEXTURE_ENV_COMBINE,
+ EXT_TEXTURE_ENV_DOT3,
++ EXT_TEXTURE_FILTER_ANISOTROPIC,
+ EXT_TEXTURE_INTEGER,
+ EXT_TEXTURE_LOD_BIAS,
+ EXT_TEXTURE_MIRROR_CLAMP,
diff --git a/debian/patches/series b/debian/patches/series
index a29c761..b231ecf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,5 @@ binary-indep/sfnt2fon.patch
gstbase.patch
font-divbyzero.patch
printer-resolution.patch
+
+revert_opengl46.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git
More information about the pkg-wine-party
mailing list