}
static inline size_t
-__gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth) {
+__gl_image_size(GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth, GLboolean has_unpack_subimage) {
unsigned num_channels = __gl_format_channels(format);
unsigned bits_per_pixel;
GLint skip_pixels = 0;
GLint skip_images = 0;
- __glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment);
- __glGetIntegerv(GL_UNPACK_ROW_LENGTH, &row_length);
- __glGetIntegerv(GL_UNPACK_IMAGE_HEIGHT, &image_height);
- __glGetIntegerv(GL_UNPACK_SKIP_ROWS, &skip_rows);
- __glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &skip_pixels);
- __glGetIntegerv(GL_UNPACK_SKIP_IMAGES, &skip_images);
+ __glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment);
+ if (has_unpack_subimage) {
+ __glGetIntegerv(GL_UNPACK_ROW_LENGTH, &row_length);
+ __glGetIntegerv(GL_UNPACK_IMAGE_HEIGHT, &image_height);
+ __glGetIntegerv(GL_UNPACK_SKIP_ROWS, &skip_rows);
+ __glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &skip_pixels);
+ __glGetIntegerv(GL_UNPACK_SKIP_IMAGES, &skip_images);
+ }
if (row_length <= 0) {
row_length = width;
return size;
}
-#define __glTexImage3D_size(format, type, width, height, depth) __gl_image_size(format, type, width, height, depth)
-#define __glTexImage2D_size(format, type, width, height) __gl_image_size(format, type, width, height, 1)
-#define __glTexImage1D_size(format, type, width) __gl_image_size(format, type, width, 1, 1)
+// note that can_unpack_subimage() is generated by gltrace.py
+#define __glTexImage3D_size(format, type, width, height, depth) __gl_image_size(format, type, width, height, depth, can_unpack_subimage())
+#define __glTexImage2D_size(format, type, width, height) __gl_image_size(format, type, width, height, 1, can_unpack_subimage())
+#define __glTexImage1D_size(format, type, width) __gl_image_size(format, type, width, 1, 1, can_unpack_subimage())
#define __glTexSubImage3D_size(format, type, width, height, depth) __glTexImage3D_size(format, type, width, height, depth)
#define __glTexSubImage2D_size(format, type, width, height) __glTexImage2D_size(format, type, width, height)
}
/*
- * 0 terminated integer/float attribute list.
+ * attribute list, terminated by the given terminator.
*/
template<class T>
static inline size_t
-__AttribList_size(const T *pAttribList)
+__AttribList_size(const T *pAttribList, const T terminator = static_cast<T>(0))
{
size_t size = 0;
if (pAttribList) {
do {
++size;
- } while (*pAttribList++);
+ } while (*pAttribList++ != terminator);
}
return size;
*/
template<class T>
static inline size_t
-__AttribList_size(const T *pAttribList, T terminator)
+__AttribPairList_size(const T *pAttribList, const T terminator = static_cast<T>(0))
{
size_t size = 0;
if (pAttribList) {
- while (pAttribList[size] != terminator)
+ while (pAttribList[size] != terminator) {
size += 2;
+ }
// terminator also counts
- size++;
+ ++size;
}
return size;