projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: Map program UBOs and SSBOs to Interface Blocks
[mesa.git]
/
src
/
mesa
/
main
/
debug.c
diff --git
a/src/mesa/main/debug.c
b/src/mesa/main/debug.c
index b50d79e0c261c91eb849b8c9904717cdcb7c1472..5ca7d5ce500a3ca886cc269dc673438b7c45f009 100644
(file)
--- a/
src/mesa/main/debug.c
+++ b/
src/mesa/main/debug.c
@@
-26,11
+26,11
@@
#include <stdio.h>
#include "mtypes.h"
#include "attrib.h"
#include <stdio.h>
#include "mtypes.h"
#include "attrib.h"
-#include "colormac.h"
#include "enums.h"
#include "formats.h"
#include "hash.h"
#include "imports.h"
#include "enums.h"
#include "formats.h"
#include "hash.h"
#include "imports.h"
+#include "macros.h"
#include "debug.h"
#include "get.h"
#include "pixelstore.h"
#include "debug.h"
#include "get.h"
#include "pixelstore.h"
@@
-272,7
+272,9
@@
write_texture_image(struct gl_texture_object *texObj,
store = ctx->Pack; /* save */
ctx->Pack = ctx->DefaultPacking;
store = ctx->Pack; /* save */
ctx->Pack = ctx->DefaultPacking;
- ctx->Driver.GetTexImage(ctx, GL_RGBA, GL_UNSIGNED_BYTE, buffer, img);
+ ctx->Driver.GetTexSubImage(ctx,
+ 0, 0, 0, img->Width, img->Height, img->Depth,
+ GL_RGBA, GL_UNSIGNED_BYTE, buffer, img);
/* make filename */
_mesa_snprintf(s, sizeof(s), "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face);
/* make filename */
_mesa_snprintf(s, sizeof(s), "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face);
@@
-411,7
+413,7
@@
dump_renderbuffer(const struct gl_renderbuffer *rb, GLboolean writeImage)
{
printf("Renderbuffer %u: %u x %u IntFormat = %s\n",
rb->Name, rb->Width, rb->Height,
{
printf("Renderbuffer %u: %u x %u IntFormat = %s\n",
rb->Name, rb->Width, rb->Height,
- _mesa_
lookup_enum_by_nr
(rb->InternalFormat));
+ _mesa_
enum_to_string
(rb->InternalFormat));
if (writeImage) {
_mesa_write_renderbuffer_image(rb);
}
if (writeImage) {
_mesa_write_renderbuffer_image(rb);
}