Immutable textures cannot be reused!

2016-03-11 22:25:49 +03:00
parent 34992d8a8f
commit d9dbb1565a
2 changed files with 7 additions and 5 deletions
@@ -483,6 +483,8 @@ namespace gl
 			}
 			else
 			{
+				u32 real_id = gl_texture.id();
+
 				if (!obj) gl_texture.set_id(0);
 				else
 				{
@@ -499,6 +501,8 @@ namespace gl

 				_obj.block_sz = (u32)get_texture_size(tex);
 				lock_gl_object(_obj);
+
+				gl_texture.set_id(real_id);
 			}
 		}

@@ -265,11 +265,9 @@ namespace rsx
 		{
 			const u32 texaddr = rsx::get_address(tex.offset(), tex.location());

-			//TODO: safe init
-			if (!m_id)
-			{
-				create();
-			}
+			//We can't re-use texture handles if using immutable storage
+			if (m_id) remove();
+			create();

 			glActiveTexture(GL_TEXTURE0 + index);
 			bind();