Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package ioquake3 to fix RC bug #923226 (failure to work
on older hardware with default settings).
unblock ioquake3/1.36+u20181222.e5da13f~dfsg-2
Thanks,
smcv
diffstat for ioquake3-1.36+u20181222.e5da13f~dfsg
ioquake3-1.36+u20181222.e5da13f~dfsg
changelog | 9
++
patches/lightall_fp.glsl-Stub-out-USE_BOX_CUBEMAP_PARALLAX-on-GLS.patch | 43
++++++++++
patches/series | 1
3 files changed, 53 insertions(+)
diff -Nru ioquake3-1.36+u20181222.e5da13f~dfsg/debian/changelog
ioquake3-1.36+u20181222.e5da13f~dfsg/debian/changelog
--- ioquake3-1.36+u20181222.e5da13f~dfsg/debian/changelog 2019-01-14
08:29:04.000000000 +0000
+++ ioquake3-1.36+u20181222.e5da13f~dfsg/debian/changelog 2019-03-08
09:09:43.000000000 +0000
@@ -1,3 +1,12 @@
+ioquake3 (1.36+u20181222.e5da13f~dfsg-2) unstable; urgency=medium
+
+ * d/p/lightall_fp.glsl-Stub-out-USE_BOX_CUBEMAP_PARALLAX-on-GLS.patch:
+ Fix shader compilation on hardware that doesn't support GLSL 1.30,
+ and in particular pre-2011 Intel GPUs (5th generation, "Ironlake",
+ or older). (Closes: #923226)
+
+ -- Simon McVittie <s...@debian.org> Fri, 08 Mar 2019 09:09:43 +0000
+
ioquake3 (1.36+u20181222.e5da13f~dfsg-1) unstable; urgency=medium
* New upstream snapshot
diff -Nru
ioquake3-1.36+u20181222.e5da13f~dfsg/debian/patches/lightall_fp.glsl-Stub-out-USE_BOX_CUBEMAP_PARALLAX-on-GLS.patch
ioquake3-1.36+u20181222.e5da13f~dfsg/debian/patches/lightall_fp.glsl-Stub-out-USE_BOX_CUBEMAP_PARALLAX-on-GLS.patch
---
ioquake3-1.36+u20181222.e5da13f~dfsg/debian/patches/lightall_fp.glsl-Stub-out-USE_BOX_CUBEMAP_PARALLAX-on-GLS.patch
1970-01-01 01:00:00.000000000 +0100
+++
ioquake3-1.36+u20181222.e5da13f~dfsg/debian/patches/lightall_fp.glsl-Stub-out-USE_BOX_CUBEMAP_PARALLAX-on-GLS.patch
2019-03-08 09:09:43.000000000 +0000
@@ -0,0 +1,43 @@
+From: Simon McVittie <s...@debian.org>
+Date: Thu, 7 Mar 2019 17:13:47 +0000
+Subject: lightall_fp.glsl: Stub out USE_BOX_CUBEMAP_PARALLAX on GLSL 1.20
+
+Otherwise this shader fails to compile on older hardware (Intel Ironlake
+Mobile, a 5th generation Intel GPU released in 2010) since commit
+e5da13f1.
+
+Signed-off-by: Simon McVittie <s...@debian.org>
+---
+ code/renderergl2/glsl/lightall_fp.glsl | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/code/renderergl2/glsl/lightall_fp.glsl
b/code/renderergl2/glsl/lightall_fp.glsl
+index d77cd7c..e954a68 100644
+--- a/code/renderergl2/glsl/lightall_fp.glsl
++++ b/code/renderergl2/glsl/lightall_fp.glsl
+@@ -193,7 +193,7 @@ float CalcLightAttenuation(float point, float normDist)
+ return attenuation;
+ }
+
+-
++#if defined(USE_BOX_CUBEMAP_PARALLAX) && __VERSION__ >= 130
+ vec4 hitCube(vec3 ray, vec3 pos, vec3 invSize, float lod, samplerCube tex)
+ {
+ // find any hits on cubemap faces facing the camera
+@@ -223,6 +223,7 @@ vec4 hitCube(vec3 ray, vec3 pos, vec3 invSize, float lod,
samplerCube tex)
+ //return vec4(textureCubeLod(tex, tc, lod).rgb * fade, fade);
+ return vec4(textureCubeLod(tex, tc, lod).rgb, 1.0);
+ }
++#endif
+
+ void main()
+ {
+@@ -404,7 +405,7 @@ void main()
+ // from
http://seblagarde.wordpress.com/2012/09/29/image-based-lighting-approaches-and-parallax-corrected-cubemap/
+ vec3 parallax = u_CubeMapInfo.xyz + u_CubeMapInfo.w * viewDir;
+
+- #if defined(USE_BOX_CUBEMAP_PARALLAX)
++ #if defined(USE_BOX_CUBEMAP_PARALLAX) && __VERSION__ >= 130
+ vec3 cubeLightColor = hitCube(R * u_CubeMapInfo.w, parallax,
u_CubeMapInfo.www, ROUGHNESS_MIPS * roughness, u_CubeMap).rgb *
u_EnableTextures.w;
+ #else
+ vec3 cubeLightColor = textureCubeLod(u_CubeMap, R + parallax,
ROUGHNESS_MIPS * roughness).rgb * u_EnableTextures.w;
diff -Nru ioquake3-1.36+u20181222.e5da13f~dfsg/debian/patches/series
ioquake3-1.36+u20181222.e5da13f~dfsg/debian/patches/series
--- ioquake3-1.36+u20181222.e5da13f~dfsg/debian/patches/series 2019-01-14
08:29:04.000000000 +0000
+++ ioquake3-1.36+u20181222.e5da13f~dfsg/debian/patches/series 2019-03-08
09:09:43.000000000 +0000
@@ -1,3 +1,4 @@
+lightall_fp.glsl-Stub-out-USE_BOX_CUBEMAP_PARALLAX-on-GLS.patch
debian/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
debian/Let-servers-set-sv_fps-too.patch
debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
