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

GL3: Remove dead code

Browse Source 
--HG--
branch : opengl3
hg/feature/opengl3
kaetemi 11 years ago
parent a17fc28955
commit 11e871c8ab
4 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File

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

@ -508,6 +508,8 @@ bool CDriverGL3::isTextureRectangle(ITexture * tex) const
// *************************************************************************** // ***************************************************************************
bool CDriverGL3::activeFrameBufferObject(ITexture * tex) bool CDriverGL3::activeFrameBufferObject(ITexture * tex)
{ {
return false; // TODO GL3 FBO
#if 0
if (supportFrameBufferObject()/* && supportPackedDepthStencil()*/) if (supportFrameBufferObject()/* && supportPackedDepthStencil()*/)
{ {
if (tex) if (tex)
@ -523,6 +525,7 @@ bool CDriverGL3::activeFrameBufferObject(ITexture * tex)
} }
return false; return false;
#endif
} }
// -------------------------------------------------- // --------------------------------------------------

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

@ -85,7 +85,7 @@ PFNGLLINKPROGRAMPROC nglLinkProgram;
PFNGLSHADERSOURCEPROC nglShaderSource; PFNGLSHADERSOURCEPROC nglShaderSource;
PFNGLUSEPROGRAMPROC nglUseProgram; PFNGLUSEPROGRAMPROC nglUseProgram;
PFNGLVALIDATEPROGRAMPROC nglValidateProgram; PFNGLVALIDATEPROGRAMPROC nglValidateProgram;
PFNGLUNIFORM1FPROC nglUniform1f; /*PFNGLUNIFORM1FPROC nglUniform1f;
PFNGLUNIFORM2FPROC nglUniform2f; PFNGLUNIFORM2FPROC nglUniform2f;
PFNGLUNIFORM3FPROC nglUniform3f; PFNGLUNIFORM3FPROC nglUniform3f;
PFNGLUNIFORM4FPROC nglUniform4f; PFNGLUNIFORM4FPROC nglUniform4f;
@ -103,16 +103,8 @@ PFNGLUNIFORM3IVPROC nglUniform3iv;
PFNGLUNIFORM4IVPROC nglUniform4iv; PFNGLUNIFORM4IVPROC nglUniform4iv;
PFNGLUNIFORMMATRIX2FVPROC nglUniformMatrix2fv; PFNGLUNIFORMMATRIX2FVPROC nglUniformMatrix2fv;
PFNGLUNIFORMMATRIX3FVPROC nglUniformMatrix3fv; PFNGLUNIFORMMATRIX3FVPROC nglUniformMatrix3fv;
PFNGLUNIFORMMATRIX4FVPROC nglUniformMatrix4fv; PFNGLUNIFORMMATRIX4FVPROC nglUniformMatrix4fv;*/
PFNGLVERTEXATTRIBPOINTERPROC nglVertexAttribPointer; PFNGLVERTEXATTRIBPOINTERPROC nglVertexAttribPointer;
PFNGLUNIFORM1UIPROC nglUniform1ui;
PFNGLUNIFORM2UIPROC nglUniform2ui;
PFNGLUNIFORM3UIPROC nglUniform3ui;
PFNGLUNIFORM4UIPROC nglUniform4ui;
PFNGLUNIFORM1UIVPROC nglUniform1uiv;
PFNGLUNIFORM2UIVPROC nglUniform2uiv;
PFNGLUNIFORM3UIVPROC nglUniform3uiv;
PFNGLUNIFORM4UIVPROC nglUniform4uiv;
PFNGLBINDBUFFERPROC nglBindBuffer; PFNGLBINDBUFFERPROC nglBindBuffer;
PFNGLDELETEBUFFERSPROC nglDeleteBuffers; PFNGLDELETEBUFFERSPROC nglDeleteBuffers;
@ -135,7 +127,7 @@ PFNGLGETQUERYIVPROC nglGetQueryiv;
PFNGLGETQUERYOBJECTIVPROC nglGetQueryObjectiv; PFNGLGETQUERYOBJECTIVPROC nglGetQueryObjectiv;
PFNGLGETQUERYOBJECTUIVPROC nglGetQueryObjectuiv; PFNGLGETQUERYOBJECTUIVPROC nglGetQueryObjectuiv;
PFNGLISRENDERBUFFERPROC nglIsRenderbuffer; /*PFNGLISRENDERBUFFERPROC nglIsRenderbuffer;
PFNGLBINDRENDERBUFFERPROC nglBindRenderbuffer; PFNGLBINDRENDERBUFFERPROC nglBindRenderbuffer;
PFNGLDELETERENDERBUFFERSPROC nglDeleteRenderbuffers; PFNGLDELETERENDERBUFFERSPROC nglDeleteRenderbuffers;
PFNGLGENRENDERBUFFERSPROC nglGenRenderbuffers; PFNGLGENRENDERBUFFERSPROC nglGenRenderbuffers;
@ -154,7 +146,7 @@ PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC nglGetFramebufferAttachmentParamete
PFNGLGENERATEMIPMAPPROC nglGenerateMipmap; PFNGLGENERATEMIPMAPPROC nglGenerateMipmap;
PFNGLBLITFRAMEBUFFERPROC nglBlitFramebuffer; PFNGLBLITFRAMEBUFFERPROC nglBlitFramebuffer;
PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC nglRenderbufferStorageMultisample; PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC nglRenderbufferStorageMultisample;
PFNGLFRAMEBUFFERTEXTURELAYERPROC nglFramebufferTextureLayer; PFNGLFRAMEBUFFERTEXTURELAYERPROC nglFramebufferTextureLayer;*/
PFNGLACTIVETEXTUREPROC nglActiveTexture; PFNGLACTIVETEXTUREPROC nglActiveTexture;
@ -367,7 +359,7 @@ static bool setupGLCore(const char *glext)
CHECK_ADDRESS(PFNGLSHADERSOURCEPROC, glShaderSource); CHECK_ADDRESS(PFNGLSHADERSOURCEPROC, glShaderSource);
CHECK_ADDRESS(PFNGLUSEPROGRAMPROC, glUseProgram); CHECK_ADDRESS(PFNGLUSEPROGRAMPROC, glUseProgram);
CHECK_ADDRESS(PFNGLVALIDATEPROGRAMPROC, glValidateProgram); CHECK_ADDRESS(PFNGLVALIDATEPROGRAMPROC, glValidateProgram);
CHECK_ADDRESS(PFNGLUNIFORM1FPROC, glUniform1f); /*CHECK_ADDRESS(PFNGLUNIFORM1FPROC, glUniform1f);
CHECK_ADDRESS(PFNGLUNIFORM2FPROC, glUniform2f); CHECK_ADDRESS(PFNGLUNIFORM2FPROC, glUniform2f);
CHECK_ADDRESS(PFNGLUNIFORM3FPROC, glUniform3f); CHECK_ADDRESS(PFNGLUNIFORM3FPROC, glUniform3f);
CHECK_ADDRESS(PFNGLUNIFORM4FPROC, glUniform4f); CHECK_ADDRESS(PFNGLUNIFORM4FPROC, glUniform4f);
@ -385,16 +377,8 @@ static bool setupGLCore(const char *glext)
CHECK_ADDRESS(PFNGLUNIFORM4IVPROC, glUniform4iv); CHECK_ADDRESS(PFNGLUNIFORM4IVPROC, glUniform4iv);
CHECK_ADDRESS(PFNGLUNIFORMMATRIX2FVPROC, glUniformMatrix2fv); CHECK_ADDRESS(PFNGLUNIFORMMATRIX2FVPROC, glUniformMatrix2fv);
CHECK_ADDRESS(PFNGLUNIFORMMATRIX3FVPROC, glUniformMatrix3fv); CHECK_ADDRESS(PFNGLUNIFORMMATRIX3FVPROC, glUniformMatrix3fv);
CHECK_ADDRESS(PFNGLUNIFORMMATRIX4FVPROC, glUniformMatrix4fv); CHECK_ADDRESS(PFNGLUNIFORMMATRIX4FVPROC, glUniformMatrix4fv);*/
CHECK_ADDRESS(PFNGLVERTEXATTRIBPOINTERPROC, glVertexAttribPointer); CHECK_ADDRESS(PFNGLVERTEXATTRIBPOINTERPROC, glVertexAttribPointer);
CHECK_ADDRESS(PFNGLUNIFORM1UIPROC, glUniform1ui);
CHECK_ADDRESS(PFNGLUNIFORM2UIPROC, glUniform2ui);
CHECK_ADDRESS(PFNGLUNIFORM3UIPROC, glUniform3ui);
CHECK_ADDRESS(PFNGLUNIFORM4UIPROC, glUniform4ui);
CHECK_ADDRESS(PFNGLUNIFORM1UIVPROC, glUniform1uiv);
CHECK_ADDRESS(PFNGLUNIFORM2UIVPROC, glUniform2uiv);
CHECK_ADDRESS(PFNGLUNIFORM3UIVPROC, glUniform3uiv);
CHECK_ADDRESS(PFNGLUNIFORM4UIVPROC, glUniform4uiv);
CHECK_ADDRESS(PFNGLBINDBUFFERPROC, glBindBuffer); CHECK_ADDRESS(PFNGLBINDBUFFERPROC, glBindBuffer);
CHECK_ADDRESS(PFNGLDELETEBUFFERSPROC, glDeleteBuffers); CHECK_ADDRESS(PFNGLDELETEBUFFERSPROC, glDeleteBuffers);
@ -417,7 +401,7 @@ static bool setupGLCore(const char *glext)
CHECK_ADDRESS(PFNGLGETQUERYOBJECTIVPROC, glGetQueryObjectiv); CHECK_ADDRESS(PFNGLGETQUERYOBJECTIVPROC, glGetQueryObjectiv);
CHECK_ADDRESS(PFNGLGETQUERYOBJECTUIVPROC, glGetQueryObjectuiv); CHECK_ADDRESS(PFNGLGETQUERYOBJECTUIVPROC, glGetQueryObjectuiv);
CHECK_ADDRESS(PFNGLISRENDERBUFFERPROC, glIsRenderbuffer); /*CHECK_ADDRESS(PFNGLISRENDERBUFFERPROC, glIsRenderbuffer);
CHECK_ADDRESS(PFNGLBINDRENDERBUFFERPROC, glBindRenderbuffer); CHECK_ADDRESS(PFNGLBINDRENDERBUFFERPROC, glBindRenderbuffer);
CHECK_ADDRESS(PFNGLDELETERENDERBUFFERSPROC, glDeleteRenderbuffers); CHECK_ADDRESS(PFNGLDELETERENDERBUFFERSPROC, glDeleteRenderbuffers);
CHECK_ADDRESS(PFNGLGENRENDERBUFFERSPROC, glGenRenderbuffers); CHECK_ADDRESS(PFNGLGENRENDERBUFFERSPROC, glGenRenderbuffers);
@ -436,7 +420,7 @@ static bool setupGLCore(const char *glext)
CHECK_ADDRESS(PFNGLGENERATEMIPMAPPROC, glGenerateMipmap); CHECK_ADDRESS(PFNGLGENERATEMIPMAPPROC, glGenerateMipmap);
CHECK_ADDRESS(PFNGLBLITFRAMEBUFFERPROC, glBlitFramebuffer); CHECK_ADDRESS(PFNGLBLITFRAMEBUFFERPROC, glBlitFramebuffer);
CHECK_ADDRESS(PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC, glRenderbufferStorageMultisample); CHECK_ADDRESS(PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC, glRenderbufferStorageMultisample);
CHECK_ADDRESS(PFNGLFRAMEBUFFERTEXTURELAYERPROC, glFramebufferTextureLayer); CHECK_ADDRESS(PFNGLFRAMEBUFFERTEXTURELAYERPROC, glFramebufferTextureLayer);*/
CHECK_ADDRESS(PFNGLACTIVETEXTUREPROC, glActiveTexture); CHECK_ADDRESS(PFNGLACTIVETEXTUREPROC, glActiveTexture);

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

@ -169,7 +169,7 @@ extern PFNGLLINKPROGRAMPROC nglLinkProgram;
extern PFNGLSHADERSOURCEPROC nglShaderSource; extern PFNGLSHADERSOURCEPROC nglShaderSource;
extern PFNGLUSEPROGRAMPROC nglUseProgram; extern PFNGLUSEPROGRAMPROC nglUseProgram;
extern PFNGLVALIDATEPROGRAMPROC nglValidateProgram; extern PFNGLVALIDATEPROGRAMPROC nglValidateProgram;
extern PFNGLUNIFORM1FPROC nglUniform1f; /*extern PFNGLUNIFORM1FPROC nglUniform1f;
extern PFNGLUNIFORM2FPROC nglUniform2f; extern PFNGLUNIFORM2FPROC nglUniform2f;
extern PFNGLUNIFORM3FPROC nglUniform3f; extern PFNGLUNIFORM3FPROC nglUniform3f;
extern PFNGLUNIFORM4FPROC nglUniform4f; extern PFNGLUNIFORM4FPROC nglUniform4f;
@ -187,16 +187,8 @@ extern PFNGLUNIFORM3IVPROC nglUniform3iv;
extern PFNGLUNIFORM4IVPROC nglUniform4iv; extern PFNGLUNIFORM4IVPROC nglUniform4iv;
extern PFNGLUNIFORMMATRIX2FVPROC nglUniformMatrix2fv; extern PFNGLUNIFORMMATRIX2FVPROC nglUniformMatrix2fv;
extern PFNGLUNIFORMMATRIX3FVPROC nglUniformMatrix3fv; extern PFNGLUNIFORMMATRIX3FVPROC nglUniformMatrix3fv;
extern PFNGLUNIFORMMATRIX4FVPROC nglUniformMatrix4fv; extern PFNGLUNIFORMMATRIX4FVPROC nglUniformMatrix4fv;*/
extern PFNGLVERTEXATTRIBPOINTERPROC nglVertexAttribPointer; extern PFNGLVERTEXATTRIBPOINTERPROC nglVertexAttribPointer;
extern PFNGLUNIFORM1UIPROC nglUniform1ui;
extern PFNGLUNIFORM2UIPROC nglUniform2ui;
extern PFNGLUNIFORM3UIPROC nglUniform3ui;
extern PFNGLUNIFORM4UIPROC nglUniform4ui;
extern PFNGLUNIFORM1UIVPROC nglUniform1uiv;
extern PFNGLUNIFORM2UIVPROC nglUniform2uiv;
extern PFNGLUNIFORM3UIVPROC nglUniform3uiv;
extern PFNGLUNIFORM4UIVPROC nglUniform4uiv;
extern PFNGLBINDBUFFERPROC nglBindBuffer; extern PFNGLBINDBUFFERPROC nglBindBuffer;
extern PFNGLDELETEBUFFERSPROC nglDeleteBuffers; extern PFNGLDELETEBUFFERSPROC nglDeleteBuffers;
@ -219,7 +211,7 @@ extern PFNGLGETQUERYIVPROC nglGetQueryiv;
extern PFNGLGETQUERYOBJECTIVPROC nglGetQueryObjectiv; extern PFNGLGETQUERYOBJECTIVPROC nglGetQueryObjectiv;
extern PFNGLGETQUERYOBJECTUIVPROC nglGetQueryObjectuiv; extern PFNGLGETQUERYOBJECTUIVPROC nglGetQueryObjectuiv;
extern PFNGLISRENDERBUFFERPROC nglIsRenderbuffer; /*extern PFNGLISRENDERBUFFERPROC nglIsRenderbuffer;
extern PFNGLBINDRENDERBUFFERPROC nglBindRenderbuffer; extern PFNGLBINDRENDERBUFFERPROC nglBindRenderbuffer;
extern PFNGLDELETERENDERBUFFERSPROC nglDeleteRenderbuffers; extern PFNGLDELETERENDERBUFFERSPROC nglDeleteRenderbuffers;
extern PFNGLGENRENDERBUFFERSPROC nglGenRenderbuffers; extern PFNGLGENRENDERBUFFERSPROC nglGenRenderbuffers;
@ -238,7 +230,7 @@ extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC nglGetFramebufferAttachment
extern PFNGLGENERATEMIPMAPPROC nglGenerateMipmap; extern PFNGLGENERATEMIPMAPPROC nglGenerateMipmap;
extern PFNGLBLITFRAMEBUFFERPROC nglBlitFramebuffer; extern PFNGLBLITFRAMEBUFFERPROC nglBlitFramebuffer;
extern PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC nglRenderbufferStorageMultisample; extern PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC nglRenderbufferStorageMultisample;
extern PFNGLFRAMEBUFFERTEXTURELAYERPROC nglFramebufferTextureLayer; extern PFNGLFRAMEBUFFERTEXTURELAYERPROC nglFramebufferTextureLayer;*/
extern PFNGLACTIVETEXTUREPROC nglActiveTexture; extern PFNGLACTIVETEXTUREPROC nglActiveTexture;

11
code/nel/src/3d/driver/opengl3/driver_opengl_texture.cpp
Unescape Escape View File

@ -85,7 +85,7 @@ CTextureDrvInfosGL3::~CTextureDrvInfosGL3()
// release in TextureUsed. // release in TextureUsed.
_Driver->_TextureUsed.erase (this); _Driver->_TextureUsed.erase (this);
if (InitFBO) /*if (InitFBO)
{ {
nglDeleteFramebuffers(1, &FBOId); nglDeleteFramebuffers(1, &FBOId);
if (AttachDepthStencil) if (AttachDepthStencil)
@ -94,12 +94,15 @@ CTextureDrvInfosGL3::~CTextureDrvInfosGL3()
if (!UsePackedDepthStencil) if (!UsePackedDepthStencil)
nglDeleteRenderbuffers(1, &StencilFBOId); nglDeleteRenderbuffers(1, &StencilFBOId);
} }
} }*/
} }
// *************************************************************************** // ***************************************************************************
bool CTextureDrvInfosGL3::initFrameBufferObject(ITexture * tex) bool CTextureDrvInfosGL3::initFrameBufferObject(ITexture * tex)
{ {
return false; // FIXME GL3 FBO
#if 0
if (!InitFBO) if (!InitFBO)
{ {
if (tex->isBloomTexture()) if (tex->isBloomTexture())
@ -233,11 +236,14 @@ bool CTextureDrvInfosGL3::initFrameBufferObject(ITexture * tex)
} }
return InitFBO; return InitFBO;
#endif
} }
// *************************************************************************** // ***************************************************************************
bool CTextureDrvInfosGL3::activeFrameBufferObject(ITexture * tex) bool CTextureDrvInfosGL3::activeFrameBufferObject(ITexture * tex)
{ {
return false; // FIXME GL3 FBO
#if 0
if (tex) if (tex)
{ {
if (initFrameBufferObject(tex)) if (initFrameBufferObject(tex))
@ -254,6 +260,7 @@ bool CTextureDrvInfosGL3::activeFrameBufferObject(ITexture * tex)
} }
return true; return true;
#endif
} }
// *************************************************************************** // ***************************************************************************

Write Preview
Loading…
Cancel
Save