pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
osg: Add patch from https://bugs.openmw.org/issues/3904
Module Name: pkgsrc-wip
Committed By: Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By: nee
Date: Sat Sep 2 18:53:07 2017 +0100
Changeset: 181699562e0c392481294645ff3c1d2bd478cd3e
Modified Files:
osg/distinfo
Added Files:
osg/patches/patch-src_osg_Texture.cpp
Log Message:
osg: Add patch from https://bugs.openmw.org/issues/3904
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=181699562e0c392481294645ff3c1d2bd478cd3e
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
osg/distinfo | 1 +
osg/patches/patch-src_osg_Texture.cpp | 96 +++++++++++++++++++++++++++++++++++
2 files changed, 97 insertions(+)
diffs:
diff --git a/osg/distinfo b/osg/distinfo
index 9204e321a4..44a183ba9d 100644
--- a/osg/distinfo
+++ b/osg/distinfo
@@ -11,3 +11,4 @@ SHA1 (patch-applications_present3D_Cluster.cpp) = ccbc1d524562d6f655a38c0ea3ff4c
SHA1 (patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp) = 5748636ed17d23a0a595d38b2b392e773840a102
SHA1 (patch-src_osgPlugins_osc_osc_OscHostEndianness.h) = d8e9efa88898e240775ead76c5c9df4c86cd562c
SHA1 (patch-src_osg_GLExtensions.cpp) = 5fc04fa162c5cf8aa34ddfb0152092b02e8eec08
+SHA1 (patch-src_osg_Texture.cpp) = 9d89e5f5d66d5fb3df974709064cd4c911d9dcac
diff --git a/osg/patches/patch-src_osg_Texture.cpp b/osg/patches/patch-src_osg_Texture.cpp
new file mode 100644
index 0000000000..dfb4bd4b64
--- /dev/null
+++ b/osg/patches/patch-src_osg_Texture.cpp
@@ -0,0 +1,96 @@
+$NetBSD$
+
+https://bugs.openmw.org/issues/3904
+
+--- src/osg/Texture.cpp.orig 2015-06-10 16:47:15.000000000 +0000
++++ src/osg/Texture.cpp
+@@ -69,7 +69,9 @@ struct InternalPixelRelations
+ GLenum type;
+ };
+
++
+ InternalPixelRelations sizedInternalFormats[] = {
++
+ { GL_R8UI , GL_RED_INTEGER_EXT , GL_UNSIGNED_BYTE }
+ , { GL_R8I , GL_RED_INTEGER_EXT , GL_BYTE }
+ , { GL_R16UI , GL_RED_INTEGER_EXT , GL_UNSIGNED_SHORT }
+@@ -99,21 +101,10 @@ InternalPixelRelations sizedInternalForm
+ , { GL_RGBA32I_EXT , GL_RGBA_INTEGER_EXT , GL_INT }
+ , { GL_RGBA32UI_EXT , GL_RGBA_INTEGER_EXT , GL_UNSIGNED_INT }
+
+- , { GL_R8_SNORM , GL_RED , GL_BYTE }
+- , { GL_R16_SNORM , GL_RED , GL_SHORT }
+- , { GL_RG8_SNORM , GL_RG , GL_BYTE }
+- , { GL_RG16_SNORM , GL_RG , GL_SHORT }
+- , { GL_RGB8_SNORM , GL_RGB , GL_BYTE }
+- , { GL_RGB16_SNORM , GL_RGB , GL_SHORT }
+- , { GL_RGBA8_SNORM , GL_RGBA , GL_BYTE }
+-
+- , { GL_SRGB8 , GL_RGB , GL_UNSIGNED_BYTE }
+- , { GL_SRGB8_ALPHA8 , GL_RGBA , GL_UNSIGNED_BYTE }
+-
+ , { GL_R8 , GL_RED , GL_UNSIGNED_BYTE }
+ , { GL_R16F , GL_RED , GL_HALF_FLOAT }
+- , { GL_R16F , GL_RED , GL_FLOAT }
+ , { GL_R32F , GL_RED , GL_FLOAT }
++ , { GL_R16F , GL_RED , GL_FLOAT }
+ , { GL_RG8 , GL_RG , GL_UNSIGNED_BYTE }
+ , { GL_RG16F , GL_RG , GL_HALF_FLOAT }
+ , { GL_RG16F , GL_RG , GL_FLOAT }
+@@ -125,10 +116,10 @@ InternalPixelRelations sizedInternalForm
+ , { GL_RGB4 , GL_RGB , GL_UNSIGNED_SHORT_4_4_4_4_REV }
+ , { GL_RGB5 , GL_RGB , GL_UNSIGNED_SHORT_5_5_5_1 }
+ , { GL_RGB5 , GL_RGB , GL_UNSIGNED_SHORT_1_5_5_5_REV }
++ , { GL_RGB8 , GL_RGB , GL_UNSIGNED_BYTE }
+ , { GL_RGB565 , GL_RGB , GL_UNSIGNED_BYTE }
+ , { GL_RGB565 , GL_RGB , GL_UNSIGNED_SHORT_5_6_5 }
+ , { GL_RGB565 , GL_RGB , GL_UNSIGNED_SHORT_5_6_5_REV }
+- , { GL_RGB8 , GL_RGB , GL_UNSIGNED_BYTE }
+ // , { GL_RGB9_E5 , GL_RGB , GL_UNSIGNED_INT_9_9_9_5, }
+ // , { GL_RGB9_E5 , GL_RGB , GL_UNSIGNED_INT_5_9_9_9_REV, }
+ // , { GL_RGB9_E5 , GL_RGB , GL_HALF_FLOAT }
+@@ -140,24 +131,36 @@ InternalPixelRelations sizedInternalForm
+ , { GL_RGB10 , GL_RGB , GL_UNSIGNED_INT_10_10_10_2 }
+ , { GL_RGB12 , GL_RGB , GL_UNSIGNED_SHORT }
+ , { GL_RGB16F_ARB , GL_RGB , GL_HALF_FLOAT }
+- , { GL_RGB16F_ARB , GL_RGB , GL_FLOAT }
+ , { GL_RGB32F_ARB , GL_RGB , GL_FLOAT }
++ , { GL_RGB16F_ARB , GL_RGB , GL_FLOAT }
++
+
++ , { GL_RGBA8 , GL_RGBA , GL_UNSIGNED_BYTE }
++ , { GL_RGB10_A2 , GL_RGBA , GL_UNSIGNED_INT_10_10_10_2 }
++ , { GL_RGB10_A2 , GL_RGBA , GL_UNSIGNED_INT_2_10_10_10_REV }
++ , { GL_RGBA12 , GL_RGBA , GL_UNSIGNED_SHORT }
++ , { GL_RGBA4 , GL_RGBA , GL_UNSIGNED_BYTE }
++ , { GL_RGBA4 , GL_RGBA , GL_UNSIGNED_SHORT_4_4_4_4 }
++ , { GL_RGBA4 , GL_RGBA , GL_UNSIGNED_SHORT_4_4_4_4_REV }
+ , { GL_RGB5_A1 , GL_RGBA , GL_UNSIGNED_BYTE }
+ , { GL_RGB5_A1 , GL_RGBA , GL_UNSIGNED_SHORT_5_5_5_1 }
+ , { GL_RGB5_A1 , GL_RGBA , GL_UNSIGNED_SHORT_1_5_5_5_REV }
+ , { GL_RGB5_A1 , GL_RGBA , GL_UNSIGNED_INT_10_10_10_2 }
+ , { GL_RGB5_A1 , GL_RGBA , GL_UNSIGNED_INT_2_10_10_10_REV }
+- , { GL_RGBA4 , GL_RGBA , GL_UNSIGNED_BYTE }
+- , { GL_RGBA4 , GL_RGBA , GL_UNSIGNED_SHORT_4_4_4_4 }
+- , { GL_RGBA4 , GL_RGBA , GL_UNSIGNED_SHORT_4_4_4_4_REV }
+- , { GL_RGBA8 , GL_RGBA , GL_UNSIGNED_BYTE }
+- , { GL_RGB10_A2 , GL_RGBA , GL_UNSIGNED_INT_10_10_10_2 }
+- , { GL_RGB10_A2 , GL_RGBA , GL_UNSIGNED_INT_2_10_10_10_REV }
+- , { GL_RGBA12 , GL_RGBA , GL_UNSIGNED_SHORT }
+ // , { GL_RGBA16F , GL_RGBA , GL_HALF_FLOAT }
+ // , { GL_RGBA16F , GL_RGBA , GL_FLOAT }
+ // , { GL_RGBA32F , GL_RGBA , GL_FLOAT }
++
++ , { GL_SRGB8 , GL_RGB , GL_UNSIGNED_BYTE }
++ , { GL_SRGB8_ALPHA8 , GL_RGBA , GL_UNSIGNED_BYTE }
++
++ , { GL_R8_SNORM , GL_RED , GL_BYTE }
++ , { GL_R16_SNORM , GL_RED , GL_SHORT }
++ , { GL_RG8_SNORM , GL_RG , GL_BYTE }
++ , { GL_RG16_SNORM , GL_RG , GL_SHORT }
++ , { GL_RGB8_SNORM , GL_RGB , GL_BYTE }
++ , { GL_RGB16_SNORM , GL_RGB , GL_SHORT }
++ , { GL_RGBA8_SNORM , GL_RGBA , GL_BYTE }
+ };
+
+ InternalPixelRelations sizedDepthAndStencilInternalFormats[] = {
Home |
Main Index |
Thread Index |
Old Index