pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
osg: Update to 3.4.1. Disabling some dependencies to match freebsd's defaults.
Module Name: pkgsrc-wip
Committed By: Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By: nee
Date: Sun Feb 11 23:42:36 2018 +0000
Changeset: e5c337d15419fac96163d336fa4eb9df19c4760e
Modified Files:
osg/Makefile
osg/PLIST
osg/distinfo
osg/patches/patch-applications_present3D_Cluster.cpp
Removed Files:
osg/patches/patch-src_osg_Texture.cpp
Log Message:
osg: Update to 3.4.1. Disabling some dependencies to match freebsd's defaults.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e5c337d15419fac96163d336fa4eb9df19c4760e
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
osg/Makefile | 31 ++++---
osg/PLIST | 57 ++++++-------
osg/distinfo | 11 ++-
.../patch-applications_present3D_Cluster.cpp | 18 ++--
osg/patches/patch-src_osg_Texture.cpp | 96 ----------------------
5 files changed, 60 insertions(+), 153 deletions(-)
diffs:
diff --git a/osg/Makefile b/osg/Makefile
index c814d2b89a..2a1710e737 100644
--- a/osg/Makefile
+++ b/osg/Makefile
@@ -1,23 +1,34 @@
# $NetBSD: Makefile,v 1.55 2015/06/30 09:57:36 ryoon Exp $
-DISTNAME= OpenSceneGraph-3.4.0
-PKGNAME= osg-3.4.0
+DISTNAME= osg-3.4.1
CATEGORIES= graphics devel
-MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PKGVERSION_NOREV}/source/
-EXTRACT_SUFX= .zip
+MASTER_SITES= ${MASTER_SITE_GITHUB:=openscenegraph/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.openscenegraph.org/projects/osg
+HOMEPAGE= http://www.openscenegraph.org
COMMENT= High performance 3D graphics toolkit
LICENSE= gnu-lgpl-v2.1
+GITHUB_PROJECT= OpenSceneGraph
+GITHUB_TAG= OpenSceneGraph-${PKGVERSION_NOREV}
+
USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE= packaging/pkgconfig/openscenegraph.pc.in
PKGCONFIG_OVERRIDE+= packaging/pkgconfig/openthreads.pc.in
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Xine=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CURL=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GDAL=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_RSVG=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Poppler-glib=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SDL=TRUE
+CMAKE_ARGS+= -DOSG_USE_QT:BOOL=OFF
CXXFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
@@ -39,14 +50,8 @@ PLIST.x11= yes
.include "../../mk/jpeg.buildlink3.mk"
.endif
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../geography/gdal-lib/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../graphics/openexr/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.if ${OPSYS} != "Darwin"
.include "../../multimedia/ffmpeg2/buildlink3.mk"
diff --git a/osg/PLIST b/osg/PLIST
index 3e1af22b2c..130f3eff18 100644
--- a/osg/PLIST
+++ b/osg/PLIST
@@ -177,6 +177,7 @@ include/osg/TransferFunction
include/osg/Transform
include/osg/TriangleFunctor
include/osg/TriangleIndexFunctor
+include/osg/TriangleLinePointIndexFunctor
include/osg/Types
include/osg/Uniform
include/osg/UserDataContainer
@@ -561,12 +562,15 @@ include/osgViewer/View
include/osgViewer/Viewer
include/osgViewer/ViewerBase
include/osgViewer/ViewerEventHandlers
-${PLIST.quartz}include/osgViewer/api/Carbon/GraphicsHandleCarbon
-${PLIST.quartz}include/osgViewer/api/Carbon/GraphicsWindowCarbon
-${PLIST.quartz}include/osgViewer/api/Carbon/PixelBufferCarbon
-${PLIST.x11}include/osgViewer/api/X11/GraphicsHandleX11
-${PLIST.x11}include/osgViewer/api/X11/GraphicsWindowX11
-${PLIST.x11}include/osgViewer/api/X11/PixelBufferX11
+include/osgViewer/api/X11/GraphicsHandleX11
+include/osgViewer/api/X11/GraphicsWindowX11
+include/osgViewer/api/X11/PixelBufferX11
+include/osgViewer/config/AcrossAllScreens
+include/osgViewer/config/PanoramicSphericalDisplay
+include/osgViewer/config/SingleScreen
+include/osgViewer/config/SingleWindow
+include/osgViewer/config/SphericalDisplay
+include/osgViewer/config/WoWVxDisplay
include/osgVolume/Export
include/osgVolume/FixedFunctionTechnique
include/osgVolume/Layer
@@ -608,55 +612,55 @@ lib/libOpenThreads.so
lib/libOpenThreads.so.20
lib/libOpenThreads.so.3.3.0
lib/libosg.so
-lib/libosg.so.130
+lib/libosg.so.131
lib/libosg.so.${PKGVERSION}
lib/libosgAnimation.so
-lib/libosgAnimation.so.130
+lib/libosgAnimation.so.131
lib/libosgAnimation.so.${PKGVERSION}
lib/libosgDB.so
-lib/libosgDB.so.130
+lib/libosgDB.so.131
lib/libosgDB.so.${PKGVERSION}
lib/libosgFX.so
-lib/libosgFX.so.130
+lib/libosgFX.so.131
lib/libosgFX.so.${PKGVERSION}
lib/libosgGA.so
-lib/libosgGA.so.130
+lib/libosgGA.so.131
lib/libosgGA.so.${PKGVERSION}
lib/libosgManipulator.so
-lib/libosgManipulator.so.130
+lib/libosgManipulator.so.131
lib/libosgManipulator.so.${PKGVERSION}
lib/libosgParticle.so
-lib/libosgParticle.so.130
+lib/libosgParticle.so.131
lib/libosgParticle.so.${PKGVERSION}
lib/libosgPresentation.so
-lib/libosgPresentation.so.130
+lib/libosgPresentation.so.131
lib/libosgPresentation.so.${PKGVERSION}
lib/libosgShadow.so
-lib/libosgShadow.so.130
+lib/libosgShadow.so.131
lib/libosgShadow.so.${PKGVERSION}
lib/libosgSim.so
-lib/libosgSim.so.130
+lib/libosgSim.so.131
lib/libosgSim.so.${PKGVERSION}
lib/libosgTerrain.so
-lib/libosgTerrain.so.130
+lib/libosgTerrain.so.131
lib/libosgTerrain.so.${PKGVERSION}
lib/libosgText.so
-lib/libosgText.so.130
+lib/libosgText.so.131
lib/libosgText.so.${PKGVERSION}
lib/libosgUI.so
-lib/libosgUI.so.130
+lib/libosgUI.so.131
lib/libosgUI.so.${PKGVERSION}
lib/libosgUtil.so
-lib/libosgUtil.so.130
+lib/libosgUtil.so.131
lib/libosgUtil.so.${PKGVERSION}
lib/libosgViewer.so
-lib/libosgViewer.so.130
+lib/libosgViewer.so.131
lib/libosgViewer.so.${PKGVERSION}
lib/libosgVolume.so
-lib/libosgVolume.so.130
+lib/libosgVolume.so.131
lib/libosgVolume.so.${PKGVERSION}
lib/libosgWidget.so
-lib/libosgWidget.so.130
+lib/libosgWidget.so.131
lib/libosgWidget.so.${PKGVERSION}
lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so
lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so
@@ -665,7 +669,6 @@ lib/osgPlugins-${PKGVERSION}/osgdb_bmp.so
lib/osgPlugins-${PKGVERSION}/osgdb_bsp.so
lib/osgPlugins-${PKGVERSION}/osgdb_bvh.so
lib/osgPlugins-${PKGVERSION}/osgdb_cfg.so
-lib/osgPlugins-${PKGVERSION}/osgdb_curl.so
lib/osgPlugins-${PKGVERSION}/osgdb_dds.so
lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osg.so
lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osganimation.so
@@ -681,10 +684,8 @@ lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgwidget.so
lib/osgPlugins-${PKGVERSION}/osgdb_dot.so
lib/osgPlugins-${PKGVERSION}/osgdb_dw.so
lib/osgPlugins-${PKGVERSION}/osgdb_dxf.so
-lib/osgPlugins-${PKGVERSION}/osgdb_exr.so
${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_ffmpeg.so
lib/osgPlugins-${PKGVERSION}/osgdb_freetype.so
-lib/osgPlugins-${PKGVERSION}/osgdb_gdal.so
${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_gif.so
lib/osgPlugins-${PKGVERSION}/osgdb_gles.so
lib/osgPlugins-${PKGVERSION}/osgdb_glsl.so
@@ -692,7 +693,6 @@ lib/osgPlugins-${PKGVERSION}/osgdb_gz.so
lib/osgPlugins-${PKGVERSION}/osgdb_hdr.so
${PLIST.quartz}lib/osgPlugins-${PKGVERSION}/osgdb_imageio.so
lib/osgPlugins-${PKGVERSION}/osgdb_ive.so
-lib/osgPlugins-${PKGVERSION}/osgdb_jp2.so
${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so
lib/osgPlugins-${PKGVERSION}/osgdb_ktx.so
lib/osgPlugins-${PKGVERSION}/osgdb_logo.so
@@ -703,7 +703,6 @@ lib/osgPlugins-${PKGVERSION}/osgdb_md2.so
lib/osgPlugins-${PKGVERSION}/osgdb_mdl.so
lib/osgPlugins-${PKGVERSION}/osgdb_normals.so
lib/osgPlugins-${PKGVERSION}/osgdb_obj.so
-lib/osgPlugins-${PKGVERSION}/osgdb_ogr.so
lib/osgPlugins-${PKGVERSION}/osgdb_openflight.so
lib/osgPlugins-${PKGVERSION}/osgdb_osc.so
lib/osgPlugins-${PKGVERSION}/osgdb_osg.so
@@ -724,7 +723,6 @@ lib/osgPlugins-${PKGVERSION}/osgdb_revisions.so
lib/osgPlugins-${PKGVERSION}/osgdb_rgb.so
lib/osgPlugins-${PKGVERSION}/osgdb_rot.so
lib/osgPlugins-${PKGVERSION}/osgdb_scale.so
-lib/osgPlugins-${PKGVERSION}/osgdb_sdl.so
lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osg.so
lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osganimation.so
lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgfx.so
@@ -741,7 +739,6 @@ lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgviewer.so
lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgvolume.so
lib/osgPlugins-${PKGVERSION}/osgdb_shp.so
lib/osgPlugins-${PKGVERSION}/osgdb_stl.so
-lib/osgPlugins-${PKGVERSION}/osgdb_svg.so
lib/osgPlugins-${PKGVERSION}/osgdb_tf.so
lib/osgPlugins-${PKGVERSION}/osgdb_tga.so
lib/osgPlugins-${PKGVERSION}/osgdb_tgz.so
diff --git a/osg/distinfo b/osg/distinfo
index 44a183ba9d..b255429a23 100644
--- a/osg/distinfo
+++ b/osg/distinfo
@@ -1,14 +1,13 @@
$NetBSD: distinfo,v 1.10 2015/11/03 21:34:11 agc Exp $
-SHA1 (OpenSceneGraph-3.4.0.zip) = 20b51f2c428fcef2687169dbb69ea170393ad69d
-RMD160 (OpenSceneGraph-3.4.0.zip) = 6043321fc1c9b23f0e536c4e18a96a97d8b16c30
-SHA512 (OpenSceneGraph-3.4.0.zip) = b598a7d68c9e5bf840d7b0a59a334037c3b6efe4d2dce333280b63a8ccef1b9a37cd5ff32b98f18e110ff9cbc48226f588e143cb1d68405edda3c60ab2f3f73a
-Size (OpenSceneGraph-3.4.0.zip) = 7975023 bytes
+SHA1 (osg-3.4.1.tar.gz) = 6fc56846f5790d85dd8139aecb958701f4f4e630
+RMD160 (osg-3.4.1.tar.gz) = 299ab7131433e7f36f0da10eb102014bce26ec83
+SHA512 (osg-3.4.1.tar.gz) = 4a65625e208d24256b5564bbe9d6f557758b51fae0acf85d1f71968a237fec299088536830fc862d25e02039de9ea13176b298a68aaa644eac958acbe1f4e143
+Size (osg-3.4.1.tar.gz) = 5686385 bytes
SHA1 (patch-ab) = 3e9a591b271317623c15bde750fafe27951ddec7
SHA1 (patch-ad) = d710056fead22adb11b265c2667873ab8b541115
SHA1 (patch-ae) = ca2f8a6cd509a914f9b643429e8384faf476f2c8
-SHA1 (patch-applications_present3D_Cluster.cpp) = ccbc1d524562d6f655a38c0ea3ff4c9549718be2
+SHA1 (patch-applications_present3D_Cluster.cpp) = 1b05be4da6632356200192d8f5aa5f08270f68d8
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-applications_present3D_Cluster.cpp b/osg/patches/patch-applications_present3D_Cluster.cpp
index 2938e50ceb..ec12f2bc50 100644
--- a/osg/patches/patch-applications_present3D_Cluster.cpp
+++ b/osg/patches/patch-applications_present3D_Cluster.cpp
@@ -1,24 +1,26 @@
-$NetBSD: patch-applications_present3D_Cluster.cpp,v 1.2 2012/05/20 19:28:19 marino Exp $
+$NetBSD$
Support more platforms.
---- applications/present3D/Cluster.cpp.orig 2015-04-13 10:43:56.000000000 +0000
+--- applications/present3D/Cluster.cpp.orig 2017-08-28 16:50:49.000000000 +0000
+++ applications/present3D/Cluster.cpp
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,8 @@
#if defined(__linux)
#include <unistd.h>
#include <linux/sockios.h>
--#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || \
++ defined(__NetBSD__) || defined(__OpenBSD__)
#include <unistd.h>
#include <sys/sockio.h>
#elif defined(__sgi)
-@@ -338,7 +338,7 @@ void Receiver::sync( void )
+@@ -340,7 +341,8 @@ void Receiver::sync( void )
}
#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \
-- defined(__DragonFly__)
-+ defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
+- defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
++ defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \
++ defined(__NetBSD__) || defined(__OpenBSD__)
socklen_t
#else
int
diff --git a/osg/patches/patch-src_osg_Texture.cpp b/osg/patches/patch-src_osg_Texture.cpp
deleted file mode 100644
index dfb4bd4b64..0000000000
--- a/osg/patches/patch-src_osg_Texture.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-$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