From d6e24c0dc229865602e7aab5a07dfc826c519c74 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 13 Sep 2007 11:00:12 +0000 Subject: [PATCH] Fix for build error during aggressive warning build --- genwrapper.conf | 9 +++++++ src/osgWrappers/osg/Texture2DArray.cpp | 35 ++++---------------------- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/genwrapper.conf b/genwrapper.conf index e83f9617c..4b3b5b7fe 100644 --- a/genwrapper.conf +++ b/genwrapper.conf @@ -435,6 +435,15 @@ configure reflector "osg::Texture::Extensions" end end +configure reflector "osg::Texture2DArray::Extensions" + configure method "__typedef__void__APIENTRY_P1" + replace with "" + end + configure method "__typedef__GLboolean__APIENTRY_P1" + replace with "" + end +end + configure reflector "osg::State" configure method "__typedef__void__APIENTRY_P1" replace with "" diff --git a/src/osgWrappers/osg/Texture2DArray.cpp b/src/osgWrappers/osg/Texture2DArray.cpp index eba9e2ac8..772a9a118 100644 --- a/src/osgWrappers/osg/Texture2DArray.cpp +++ b/src/osgWrappers/osg/Texture2DArray.cpp @@ -330,36 +330,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture2DArray::Extensions) __void__glCompressedTexSubImage3D__GLenum__GLint__GLint__GLint__GLint__GLsizei__GLsizei__GLsizei__GLenum__GLsizei__C5_GLvoid_P1, "", ""); - I_ProtectedMethod1(typedef, void, IN, APIENTRY *, GLTexImage3DProc, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __typedef__void__APIENTRY_P1, - "", - ""); - I_ProtectedMethod1(typedef, void, IN, APIENTRY *, GLTexSubImage3DProc, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __typedef__void__APIENTRY_P1, - "", - ""); - I_ProtectedMethod1(typedef, void, IN, APIENTRY *, CompressedTexImage3DArbProc, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __typedef__void__APIENTRY_P1, - "", - ""); - I_ProtectedMethod1(typedef, void, IN, APIENTRY *, CompressedTexSubImage3DArbProc, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __typedef__void__APIENTRY_P1, - "", - ""); - I_ProtectedMethod1(typedef, void, IN, APIENTRY *, GLCopyTexSubImageProc, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __typedef__void__APIENTRY_P1, - "", - ""); + + + + + I_SimpleProperty(GLint, Max2DSize, 0, __void__setMax2DSize__GLint);