diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-04 09:28:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-04 09:28:39 +0100 |
| commit | 23e2767dc3e6b8891d4b55b711c70c6bc85a6f85 (patch) | |
| tree | 04c538697c3afbd401afb1bb614460b16be28844 /mesalib/src/mesa/main/debug.c | |
| parent | 125500b44d0253d7fd7a59905ab730151d4f66e2 (diff) | |
| parent | 02f377d5e2dd18537d0807ad63675a0970b5a37d (diff) | |
| download | vcxsrv-23e2767dc3e6b8891d4b55b711c70c6bc85a6f85.tar.gz vcxsrv-23e2767dc3e6b8891d4b55b711c70c6bc85a6f85.tar.bz2 vcxsrv-23e2767dc3e6b8891d4b55b711c70c6bc85a6f85.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/ddraw.h
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winmonitors.c
xorg-server/hw/xwin/winprocarg.c
xorg-server/hw/xwin/winwin32rootlesswndproc.c
xorg-server/include/scrnintstr.h
xorg-server/xkb/ddxList.c
xorg-server/xkb/ddxLoad.c
Diffstat (limited to 'mesalib/src/mesa/main/debug.c')
| -rw-r--r-- | mesalib/src/mesa/main/debug.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/debug.c b/mesalib/src/mesa/main/debug.c index 6e695d147..72aa8cb4f 100644 --- a/mesalib/src/mesa/main/debug.c +++ b/mesalib/src/mesa/main/debug.c @@ -50,7 +50,8 @@ tex_target_name(GLenum tgt) { GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP" }, { GL_TEXTURE_RECTANGLE, "GL_TEXTURE_RECTANGLE" }, { GL_TEXTURE_1D_ARRAY_EXT, "GL_TEXTURE_1D_ARRAY" }, - { GL_TEXTURE_2D_ARRAY_EXT, "GL_TEXTURE_2D_ARRAY" } + { GL_TEXTURE_2D_ARRAY_EXT, "GL_TEXTURE_2D_ARRAY" }, + { GL_TEXTURE_EXTERNAL_OES, "GL_TEXTURE_EXTERNAL_OES" } }; GLuint i; for (i = 0; i < Elements(tex_targets); i++) { |