Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:28:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #10280 from samcake/white

Browse source 
Fixing the crash on mac at start up
This commit is contained in:
Sam Gateau 2017-04-25 14:32:23 -07:00 committed by GitHub
commit 59ed51c702
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/gpu-gl/src/gpu/gl41/GL41BackendTexture.cpp
View file

@ -69,9 +69,7 @@ GL41Texture::GL41Texture(const std::weak_ptr<GLBackend>& backend, const Texture&
GLuint GL41Texture::allocate(const Texture& texture) { GLuint GL41Texture::allocate(const Texture& texture) {
GLuint result; GLuint result;
// FIXME technically GL 4.2, but OSX includes the ARB_texture_storage extension glGenTextures(1, &result);
glCreateTextures(getGLTextureType(texture), 1, &result);
//glGenTextures(1, &result);
return result; return result;
} }
@ -280,7 +278,7 @@ void GL41VariableAllocationTexture::promote() {
withPreservedTexture([&] { withPreservedTexture([&] {
GLuint fbo { 0 }; GLuint fbo { 0 };
glCreateFramebuffers(1, &fbo); glGenFramebuffers(1, &fbo);
glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo); glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo);
uint16_t mips = _gpuObject.getNumMips(); uint16_t mips = _gpuObject.getNumMips();