mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-05 03:50:07 +00:00
Code Activity

More robust checking for OpenGLTexture::release.

Browse source
This commit is contained in:
jules 2012-11-09 09:49:25 +00:00
parent 48ffccb8b8
commit 2590de5bad
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/juce_opengl/opengl/juce_OpenGLTexture.cpp
View file

@ -24,7 +24,7 @@
*/
OpenGLTexture::OpenGLTexture()
: textureID (0), width (0), height (0)
: textureID (0), width (0), height (0), ownerContext (nullptr)
{
}
@ -40,9 +40,11 @@ bool OpenGLTexture::isValidSize (int width, int height)
void OpenGLTexture::create (const int w, const int h, const void* pixels, GLenum type)
{
ownerContext = OpenGLContext::getCurrentContext();
// Texture objects can only be created when the current thread has an active OpenGL
// context. You'll need to create this object in one of the OpenGLContext's callbacks.
jassert (OpenGLHelpers::isContextActive());
jassert (ownerContext != nullptr);
jassert (isValidSize (w, h)); // Perhaps these dimensions must be a power-of-two?
@ -140,10 +142,10 @@ void OpenGLTexture::loadARGBFlipped (const PixelARGB* pixels, int w, int h)
void OpenGLTexture::release()
{
if (textureID != 0)
if (textureID != 0
&& ownerContext == OpenGLContext::getCurrentContext())
{
if (OpenGLHelpers::isContextActive())
glDeleteTextures (1, &textureID);
glDeleteTextures (1, &textureID);
textureID = 0;
width = 0;

1
modules/juce_opengl/opengl/juce_OpenGLTexture.h
View file

@ -110,6 +110,7 @@ public:
private:
GLuint textureID;
int width, height;
OpenGLContext* ownerContext;
void create (int w, int h, const void*, GLenum type);