MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Correct check for image textures support in TextureManipulationObjectFactory classes.

Browse Source
This commit is contained in:
Sergey Lipskiy 2017-02-03 17:29:12 +07:00
parent 4456d43daf
commit c07231a825
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Graphics/OpenGLContext/opengl_TextureManipulationObjectFactory.cpp
View File

@ -1,3 +1,4 @@
#include <assert.h>
#include <unordered_map> #include <unordered_map>
#include <Graphics/Parameters.h> #include <Graphics/Parameters.h>
#include "opengl_GLInfo.h" #include "opengl_GLInfo.h"
@ -98,7 +99,10 @@ namespace opengl {
#endif #endif
} }
Init2DTexStorage(CachedBindTexture* _bind) : m_bind(_bind) {} Init2DTexStorage(CachedBindTexture* _bind, bool _imageTextures)
: m_bind(_bind)
, m_imageTextures(_imageTextures) {
}
void init2DTexture(const graphics::Context::InitTextureParams & _params) override void init2DTexture(const graphics::Context::InitTextureParams & _params) override
{ {
@ -124,7 +128,7 @@ namespace opengl {
_params.data); _params.data);
} }
if (_params.ImageUnit.isValid() && glBindImageTexture != nullptr) if (_params.ImageUnit.isValid() && m_imageTextures)
glBindImageTexture(GLuint(_params.ImageUnit), GLuint(_params.handle), glBindImageTexture(GLuint(_params.ImageUnit), GLuint(_params.handle),
0, GL_FALSE, GL_FALSE, GL_READ_ONLY, GLuint(_params.internalFormat)); 0, GL_FALSE, GL_FALSE, GL_READ_ONLY, GLuint(_params.internalFormat));
} }
@ -150,6 +154,7 @@ namespace opengl {
private: private:
CachedBindTexture* m_bind; CachedBindTexture* m_bind;
bool m_imageTextures;
graphics::ObjectHandle m_handle; graphics::ObjectHandle m_handle;
}; };
@ -187,9 +192,11 @@ namespace opengl {
_params.data); _params.data);
} }
if (_params.ImageUnit.isValid() && glBindImageTexture != nullptr) if (_params.ImageUnit.isValid()) {
assert(glBindImageTexture != nullptr);
glBindImageTexture(GLuint(_params.ImageUnit), GLuint(_params.handle), glBindImageTexture(GLuint(_params.ImageUnit), GLuint(_params.handle),
0, GL_FALSE, GL_FALSE, GL_READ_ONLY, GLuint(_params.internalFormat)); 0, GL_FALSE, GL_FALSE, GL_READ_ONLY, GLuint(_params.internalFormat));
}
} }
else { else {
glTexStorage2DMultisample(GLuint(_params.handle), glTexStorage2DMultisample(GLuint(_params.handle),
@ -216,8 +223,9 @@ namespace opengl {
class Update2DTexSubImage : public Update2DTexture class Update2DTexSubImage : public Update2DTexture
{ {
public: public:
Update2DTexSubImage(CachedBindTexture* _bind) Update2DTexSubImage(CachedBindTexture* _bind, bool _imageTextures)
: m_bind(_bind) { : m_bind(_bind)
, m_imageTextures(_imageTextures) {
} }
void update2DTexture(const graphics::Context::UpdateTextureDataParams & _params) override void update2DTexture(const graphics::Context::UpdateTextureDataParams & _params) override
@ -234,13 +242,14 @@ namespace opengl {
GLenum(_params.dataType), GLenum(_params.dataType),
_params.data); _params.data);
if (_params.ImageUnit.isValid() && _params.internalFormat.isValid() && glBindImageTexture != nullptr) if (_params.ImageUnit.isValid() && _params.internalFormat.isValid() && m_imageTextures)
glBindImageTexture(GLuint(_params.ImageUnit), GLuint(_params.handle), glBindImageTexture(GLuint(_params.ImageUnit), GLuint(_params.handle),
0, GL_FALSE, GL_FALSE, GL_READ_ONLY, GLuint(_params.internalFormat)); 0, GL_FALSE, GL_FALSE, GL_READ_ONLY, GLuint(_params.internalFormat));
} }
private: private:
CachedBindTexture* m_bind; CachedBindTexture* m_bind;
bool m_imageTextures;
}; };
class Update2DTextureSubImage : public Update2DTexture class Update2DTextureSubImage : public Update2DTexture
@ -266,9 +275,11 @@ namespace opengl {
GLenum(_params.dataType), GLenum(_params.dataType),
_params.data); _params.data);
if (_params.ImageUnit.isValid() && _params.internalFormat.isValid() && glBindImageTexture != nullptr) if (_params.ImageUnit.isValid() && _params.internalFormat.isValid()) {
assert(glBindImageTexture != nullptr);
glBindImageTexture(GLuint(_params.ImageUnit), GLuint(_params.handle), glBindImageTexture(GLuint(_params.ImageUnit), GLuint(_params.handle),
0, GL_FALSE, GL_FALSE, GL_READ_ONLY, GLuint(_params.internalFormat)); 0, GL_FALSE, GL_FALSE, GL_READ_ONLY, GLuint(_params.internalFormat));
}
} }
}; };
@ -376,7 +387,7 @@ namespace opengl {
return new Init2DTextureStorage; return new Init2DTextureStorage;
if (Init2DTexStorage::Check(m_glInfo)) if (Init2DTexStorage::Check(m_glInfo))
return new Init2DTexStorage(m_cachedFunctions.getCachedBindTexture()); return new Init2DTexStorage(m_cachedFunctions.getCachedBindTexture(), m_glInfo.imageTextures);
return new Init2DTexImage(m_cachedFunctions.getCachedBindTexture()); return new Init2DTexImage(m_cachedFunctions.getCachedBindTexture());
} }
@ -386,7 +397,7 @@ namespace opengl {
if (Update2DTextureSubImage::Check(m_glInfo)) if (Update2DTextureSubImage::Check(m_glInfo))
return new Update2DTextureSubImage; return new Update2DTextureSubImage;
return new Update2DTexSubImage(m_cachedFunctions.getCachedBindTexture()); return new Update2DTexSubImage(m_cachedFunctions.getCachedBindTexture(), m_glInfo.imageTextures);
} }
Set2DTextureParameters * TextureManipulationObjectFactory::getSet2DTextureParameters() const Set2DTextureParameters * TextureManipulationObjectFactory::getSet2DTextureParameters() const