|
|
@@ -7316,6 +7316,7 @@ framebuffer_copy_to_ram(Texture *tex, int view, int z,
|
|
|
|
|
|
GLenum external_format = get_external_image_format(tex);
|
|
|
|
|
|
+#ifndef NDEBUG
|
|
|
if (GLCAT.is_spam()) {
|
|
|
GLCAT.spam()
|
|
|
<< "glReadPixels(" << xo << ", " << yo << ", " << w << ", " << h << ", ";
|
|
|
@@ -7359,10 +7360,72 @@ framebuffer_copy_to_ram(Texture *tex, int view, int z,
|
|
|
case GL_FLOAT:
|
|
|
GLCAT.spam(false) << "GL_FLOAT";
|
|
|
break;
|
|
|
+ case GL_UNSIGNED_SHORT_4_4_4_4:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_SHORT_4_4_4_4";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_SHORT_5_5_5_1:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_SHORT_5_5_5_1";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_SHORT_5_6_5:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_SHORT_5_6_5";
|
|
|
+ break;
|
|
|
#ifndef OPENGLES_1
|
|
|
case GL_INT:
|
|
|
GLCAT.spam(false) << "GL_INT";
|
|
|
break;
|
|
|
+ case GL_BYTE:
|
|
|
+ GLCAT.spam(false) << "GL_BYTE";
|
|
|
+ break;
|
|
|
+ case GL_SHORT:
|
|
|
+ GLCAT.spam(false) << "GL_SHORT";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_INT:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_INT";
|
|
|
+ break;
|
|
|
+ case GL_HALF_FLOAT:
|
|
|
+ GLCAT.spam(false) << "GL_HALF_FLOAT";
|
|
|
+ break;
|
|
|
+#endif
|
|
|
+#ifndef OPENGLES
|
|
|
+ case GL_UNSIGNED_BYTE_3_3_2:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_BYTE_3_3_2";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_BYTE_2_3_3_REV:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_BYTE_2_3_3_REV";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_SHORT_5_6_5_REV:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_SHORT_5_6_5_REV";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_SHORT_4_4_4_4_REV:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_SHORT_4_4_4_4_REV";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_SHORT_1_5_5_5_REV:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_SHORT_1_5_5_5_REV";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_INT_8_8_8_8:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_INT_8_8_8_8";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_INT_8_8_8_8_REV:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_INT_8_8_8_8_REV";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_INT_10_10_10_2:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_INT_10_10_10_2";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_INT_2_10_10_10_REV:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_INT_2_10_10_10_REV";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_INT_24_8:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_INT_24_8";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_INT_10F_11F_11F_REV:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_INT_10F_11F_11F_REV";
|
|
|
+ break;
|
|
|
+ case GL_UNSIGNED_INT_5_9_9_9_REV:
|
|
|
+ GLCAT.spam(false) << "GL_UNSIGNED_INT_5_9_9_9_REV";
|
|
|
+ break;
|
|
|
+ case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
|
|
|
+ GLCAT.spam(false) << "GL_FLOAT_32_UNSIGNED_INT_24_8_REV";
|
|
|
+ break;
|
|
|
#endif
|
|
|
default:
|
|
|
GLCAT.spam(false) << "unknown";
|
|
|
@@ -7371,6 +7434,7 @@ framebuffer_copy_to_ram(Texture *tex, int view, int z,
|
|
|
GLCAT.spam(false)
|
|
|
<< ")" << endl;
|
|
|
}
|
|
|
+#endif // NDEBUG
|
|
|
|
|
|
unsigned char *image_ptr = tex->modify_ram_image();
|
|
|
size_t image_size = tex->get_ram_image_size();
|