jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up pixel unpack buffer for dynamic textures, and add some more error handling code for other GL functions

Browse Source
This commit is contained in:
jp9000
2013-10-05 09:48:35 -07:00
parent 7f59eebea5
commit 5a41589015
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libobs-opengl/gl-texture2d.c
View File

@@ -98,15 +98,6 @@ fail:
return NULL;
}
void texture_destroy(texture_t tex)
{
if (!tex)
return;
glDeleteTextures(1, &tex->texture);
bfree(tex);
}
static inline bool is_texture_2d(texture_t tex, const char *func)
{
bool is_tex2d = tex->type == GS_TEXTURE_2D;
@@ -115,6 +106,26 @@ static inline bool is_texture_2d(texture_t tex, const char *func)
return is_tex2d;
}
void texture_destroy(texture_t tex)
{
struct gs_texture_2d *tex2d = (struct gs_texture_2d*)tex;
if (!tex)
return;
if (!is_texture_2d(tex, "texture_destroy"))
return;
if (tex->is_dynamic && tex2d->unpack_buffer) {
glDeleteBuffers(1, tex2d->unpack_buffer);
gl_success("glDeleteBuffers");
}
glDeleteTextures(1, &tex->texture);
gl_success("glDeleteTextures");
bfree(tex);
}
uint32_t texture_getwidth(texture_t tex)
{
struct gs_texture_2d *tex2d = (struct gs_texture_2d*)tex;

6
libobs-opengl/gl-texturecube.c
View File

@@ -82,7 +82,11 @@ void cubetexture_destroy(texture_t tex)
if (!tex)
return;
glDeleteTextures(1, &tex->texture);
if (tex->texture) {
glDeleteTextures(1, &tex->texture);
gl_success("glDeleteTextures");
}
bfree(tex);
}