Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

GL3: Remove GL_ARB_multisample

Browse Source 
--HG--
branch : opengl3
hg/feature/opengl3
kaetemi 11 years ago
parent 5ad62b942a
commit 4fe91132ce
3 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File

20
code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp
Unescape Escape View File

@ -395,9 +395,6 @@ PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC nglProgramUniformMatrix4x3dv;
PFNGLVALIDATEPROGRAMPIPELINEPROC nglValidateProgramPipeline;
PFNGLGETPROGRAMPIPELINEINFOLOGPROC nglGetProgramPipelineInfoLog;
// GL_ARB_multisample
NEL_PFNGLSAMPLECOVERAGEARBPROC nglSampleCoverageARB;
#ifdef NL_OS_WINDOWS
PFNWGLALLOCATEMEMORYNVPROC nwglAllocateMemoryNV;
PFNWGLFREEMEMORYNVPROC nwglFreeMemoryNV;
@ -563,17 +560,6 @@ static bool setupWGLARBPBuffer(const char *glext)
return true;
}
// *********************************
static bool setupARBMultisample(const char *glext)
{
H_AUTO_OGL(setupARBMultisample);
CHECK_EXT("GL_ARB_multisample");
CHECK_ADDRESS(NEL_PFNGLSAMPLECOVERAGEARBPROC, glSampleCoverageARB);
return true;
}
#ifdef NL_OS_WINDOWS
// *********************************
static bool setupWGLARBPixelFormat (const char *glext)
@ -841,12 +827,6 @@ void registerGlExtensions(CGlExtensions &ext)
// ---
// Check ARBMultiTexture
ext.ARBMultiTexture= setupARBMultiTexture(glext);
// Check ARBMultisample
ext.ARBMultisample = setupARBMultisample(glext);
// Check EXTSecondaryColor
ext.EXTSecondaryColor= setupEXTSecondaryColor(glext);

13
code/nel/src/3d/driver/opengl3/driver_opengl_extension.h
Unescape Escape View File

@ -47,12 +47,10 @@ struct CGlExtensions
// Required Extensions. (old)
bool ARBMultiTexture;
// uint NbTextureStages;
// Optional Extensions. (old)
bool EXTSecondaryColor;
bool EXTBlendColor;
bool ARBMultisample;
// WGL ARB extensions, true if supported
bool WGLARBPBuffer;
@ -79,7 +77,6 @@ public:
ARBMultiTexture= false;
EXTSecondaryColor= false;
EXTBlendColor= false;
ARBMultisample = false;
WGLARBPBuffer = false;
WGLARBPixelFormat = false;
@ -96,8 +93,10 @@ public:
result += GLVersion;
result += "; Available extensions:";
result += "\n Required: ";
result += "\n Core: ";
result += GLCore ? "GLCore " : "";
result += "\n Programs: ";
result += ARBSeparateShaderObjects ? "ARBSeparateShaderObjects " : "";
result += "\n Texturing: ";
@ -110,7 +109,6 @@ public:
result += "\n Misc: ";
result += EXTSecondaryColor ? "EXTSecondaryColor " : "";
result += EXTBlendColor ? "EXTBlendColor " : "";
result += ARBMultisample ? "ARBMultisample " : "";
#ifdef NL_OS_WINDOWS
result += "\n WindowsGL: ";
@ -543,11 +541,6 @@ extern NEL_PFNGLXGETSWAPINTERVALMESAPROC nglXGetSwapIntervalMESA;
#endif
// GL_ARB_multisample
extern NEL_PFNGLSAMPLECOVERAGEARBPROC nglSampleCoverageARB;
#endif // NL_OPENGL_EXTENSION_H

22
code/nel/src/3d/driver/opengl3/driver_opengl_extension_def.h
Unescape Escape View File

@ -73,23 +73,6 @@ typedef void (APIENTRY * NEL_PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshor
typedef void (APIENTRY * NEL_PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
// ARB_TextureCompression.
//========================
typedef void (APIENTRY * NEL_PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
typedef void (APIENTRY * NEL_PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
typedef void (APIENTRY * NEL_PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
typedef void (APIENTRY * NEL_PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
typedef void (APIENTRY * NEL_PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
typedef void (APIENTRY * NEL_PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
typedef void (APIENTRY * NEL_PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, void *img);
// VertexWeighting.
//==================
typedef void (APIENTRY * NEL_PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
typedef void (APIENTRY * NEL_PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
typedef void (APIENTRY * NEL_PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
// SecondaryColor extension
//========================
@ -175,11 +158,6 @@ typedef GLboolean (APIENTRY *NEL_PFNGLISPROGRAMARBPROC)(GLuint program);
typedef GLvoid (APIENTRY * NEL_PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
#ifndef NL_GL_ARB_multisample
#define NL_GL_ARB_multisample 1
typedef GLvoid (APIENTRY * NEL_PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
#endif
#if defined(NL_OS_MAC)
// Mac GL extensions

Write Preview
Loading…
Cancel
Save