From 27d753b4d0b955e020359a36ec709862c9f08482 Mon Sep 17 00:00:00 2001 From: Galleon Date: Fri, 28 Mar 2014 23:17:00 +1100 Subject: [PATCH] Fixed intr crash on create/free hardware image bug --- internal/c/libqb.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/internal/c/libqb.cpp b/internal/c/libqb.cpp index f33fa5ed3..756ee8cc6 100644 --- a/internal/c/libqb.cpp +++ b/internal/c/libqb.cpp @@ -455,8 +455,8 @@ int32 new_hardware_img(int32 x, int32 y, uint32 *pixels, int32 flags){ // therefore, no attempt is made to convert the non-power-of-2 SCREEN sizes via software // to avoid the performance hit this would incur //create hardware img - static int32 handle; - static hardware_img_struct* hardware_img; + int32 handle; + hardware_img_struct* hardware_img; handle=list_add(hardware_img_handles); hardware_img=(hardware_img_struct*)list_get(hardware_img_handles,handle); hardware_img->w=x; @@ -480,12 +480,10 @@ int32 new_hardware_img(int32 x, int32 y, uint32 *pixels, int32 flags){ hardware_img->texture_handle=new_texture_handle(); glBindTexture (GL_TEXTURE_2D, hardware_img->texture_handle); glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, x, y, 0, GL_BGRA, GL_UNSIGNED_BYTE, pixels); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameterf ( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - } return handle; }