spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove EXT/ARB suffixes 

CubeMaps & BGR(A) are core feature in 2.1

FBO variants are handled by libepoxy
pull/721/head
Hleb Valoshka 2020-05-05 11:18:51 +03:00
parent ae27c1a1b0
commit a75312e748
4 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/celengine/framebuffer.cpp
View File

@ -16,7 +16,7 @@ FramebufferObject::FramebufferObject(GLuint width, GLuint height, unsigned int a
m_colorTexId(0),
m_depthTexId(0),
m_fboId(0),
m_status(GL_FRAMEBUFFER_UNSUPPORTED_EXT)
m_status(GL_FRAMEBUFFER_UNSUPPORTED)
{
if (attachments != 0)
{
@ -33,7 +33,7 @@ FramebufferObject::FramebufferObject(FramebufferObject &&other) :
m_status(other.m_status)
{
other.m_fboId = 0;
other.m_status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
other.m_status = GL_FRAMEBUFFER_UNSUPPORTED;
}
FramebufferObject& FramebufferObject::operator=(FramebufferObject &&other)
@ -46,7 +46,7 @@ FramebufferObject& FramebufferObject::operator=(FramebufferObject &&other)
m_status = other.m_status;
other.m_fboId = 0;
other.m_status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
other.m_status = GL_FRAMEBUFFER_UNSUPPORTED;
return *this;
}
@ -58,7 +58,7 @@ FramebufferObject::~FramebufferObject()
bool
FramebufferObject::isValid() const
{
return m_status == GL_FRAMEBUFFER_COMPLETE_EXT;
return m_status == GL_FRAMEBUFFER_COMPLETE;
}
GLuint
@ -123,19 +123,19 @@ void
FramebufferObject::generateFbo(unsigned int attachments)
{
// Create the FBO
glGenFramebuffersEXT(1, &m_fboId);
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fboId);
glGenFramebuffers(1, &m_fboId);
glBindFramebuffer(GL_FRAMEBUFFER, m_fboId);
glReadBuffer(GL_NONE);
if ((attachments & ColorAttachment) != 0)
{
generateColorTexture();
glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_colorTexId, 0);
m_status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
if (m_status != GL_FRAMEBUFFER_COMPLETE_EXT)
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_colorTexId, 0);
m_status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
if (m_status != GL_FRAMEBUFFER_COMPLETE)
{
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
cleanup();
return;
}
@ -149,22 +149,22 @@ FramebufferObject::generateFbo(unsigned int attachments)
if ((attachments & DepthAttachment) != 0)
{
generateDepthTexture();
glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, m_depthTexId, 0);
m_status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
if (m_status != GL_FRAMEBUFFER_COMPLETE_EXT)
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, m_depthTexId, 0);
m_status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
if (m_status != GL_FRAMEBUFFER_COMPLETE)
{
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
cleanup();
return;
}
}
else
{
glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, 0, 0);
}
// Restore default frame buffer
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
}
// Delete all GL objects associated with this framebuffer object
@ -173,7 +173,7 @@ FramebufferObject::cleanup()
{
if (m_fboId != 0)
{
glDeleteFramebuffersEXT(1, &m_fboId);
glDeleteFramebuffers(1, &m_fboId);
}
if (m_colorTexId != 0)
@ -192,7 +192,7 @@ FramebufferObject::bind()
{
if (isValid())
{
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fboId);
glBindFramebuffer(GL_FRAMEBUFFER, m_fboId);
return true;
}
@ -203,6 +203,6 @@ bool
FramebufferObject::unbind()
{
// Restore default frame buffer
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
return true;
}

2
src/celengine/render.cpp
View File

@ -5385,7 +5385,7 @@ bool Renderer::getInfo(map<string, string>& info) const
info["PointSizeGran"] = fmt::sprintf("%.2f", pointSizeGran);
GLint maxCubeMapSize = 0;
glGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, &maxCubeMapSize);
glGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE, &maxCubeMapSize);
info["MaxCubeMapSize"] = to_string(maxCubeMapSize);
GLint maxVaryings = 0;

14
src/celengine/texture.cpp
View File

@ -116,10 +116,10 @@ static int getInternalFormat(int format)
switch (format)
{
case GL_RGBA:
case GL_BGRA_EXT:
case GL_BGRA:
return 4;
case GL_RGB:
case GL_BGR_EXT:
case GL_BGR:
return 3;
case GL_LUMINANCE_ALPHA:
return 2;
@ -147,10 +147,10 @@ static int getCompressedInternalFormat(int format)
switch (format)
{
case GL_RGB:
case GL_BGR_EXT:
case GL_BGR:
return GL_COMPRESSED_RGB;
case GL_RGBA:
case GL_BGRA_EXT:
case GL_BGRA:
return GL_COMPRESSED_RGBA;
case GL_ALPHA:
return GL_COMPRESSED_ALPHA;
@ -436,7 +436,7 @@ ImageTexture::ImageTexture(Image& img,
}
#ifdef NO_GLU
if (genMipmaps && gl::EXT_framebuffer_object)
glGenerateMipmapEXT(GL_TEXTURE_2D);
glGenerateMipmap(GL_TEXTURE_2D);
#endif
DumpTextureMipmapInfo(GL_TEXTURE_2D);
@ -623,7 +623,7 @@ TiledTexture::TiledTexture(Image& img,
if (gl::EXT_framebuffer_object)
{
LoadMiplessTexture(*tile, GL_TEXTURE_2D);
glGenerateMipmapEXT(GL_TEXTURE_2D);
glGenerateMipmap(GL_TEXTURE_2D);
}
else
{
@ -786,7 +786,7 @@ CubeMap::CubeMap(Image* faces[]) :
}
#ifdef NO_GLU
if (genMipmaps && gl::EXT_framebuffer_object)
glGenerateMipmapEXT(GL_TEXTURE_CUBE_MAP);
glGenerateMipmap(GL_TEXTURE_CUBE_MAP);
#endif
DumpTextureMipmapInfo(GL_TEXTURE_CUBE_MAP_POSITIVE_X);
}

34
src/tools/cmod/cmodview/glframebuffer.cpp
View File

@ -18,7 +18,7 @@ GLFrameBufferObject::GLFrameBufferObject(GLuint width, GLuint height, unsigned i
m_colorTexId(0),
m_depthTexId(0),
m_fboId(0),
m_status(GL_FRAMEBUFFER_UNSUPPORTED_EXT)
m_status(GL_FRAMEBUFFER_UNSUPPORTED)
{
if (attachments != 0)
{
@ -36,7 +36,7 @@ GLFrameBufferObject::~GLFrameBufferObject()
bool
GLFrameBufferObject::isValid() const
{
return m_status == GL_FRAMEBUFFER_COMPLETE_EXT;
return m_status == GL_FRAMEBUFFER_COMPLETE;
}
@ -112,19 +112,19 @@ void
GLFrameBufferObject::generateFbo(unsigned int attachments)
{
// Create the FBO
glGenFramebuffersEXT(1, &m_fboId);
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fboId);
glGenFramebuffers(1, &m_fboId);
glBindFramebuffer(GL_FRAMEBUFFER, m_fboId);
glReadBuffer(GL_NONE);
if ((attachments & ColorAttachment) != 0)
{
generateColorTexture();
glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_colorTexId, 0);
m_status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
if (m_status != GL_FRAMEBUFFER_COMPLETE_EXT)
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_colorTexId, 0);
m_status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
if (m_status != GL_FRAMEBUFFER_COMPLETE)
{
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
cleanup();
return;
}
@ -138,22 +138,22 @@ GLFrameBufferObject::generateFbo(unsigned int attachments)
if ((attachments & DepthAttachment) != 0)
{
generateDepthTexture();
glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, m_depthTexId, 0);
m_status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
if (m_status != GL_FRAMEBUFFER_COMPLETE_EXT)
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, m_depthTexId, 0);
m_status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
if (m_status != GL_FRAMEBUFFER_COMPLETE)
{
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
cleanup();
return;
}
}
else
{
glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0);
}
// Restore default frame buffer
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
}
@ -163,7 +163,7 @@ GLFrameBufferObject::cleanup()
{
if (m_fboId != 0)
{
glDeleteFramebuffersEXT(1, &m_fboId);
glDeleteFramebuffers(1, &m_fboId);
}
if (m_colorTexId != 0)
@ -183,7 +183,7 @@ GLFrameBufferObject::bind()
{
if (isValid())
{
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fboId);
glBindFramebuffer(GL_FRAMEBUFFER, m_fboId);
return true;
}
return false;
@ -194,7 +194,7 @@ bool
GLFrameBufferObject::unbind()
{
// Restore default frame buffer
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
return true;
}