projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: document sRGBDecode field
[mesa.git]
/
src
/
mesa
/
main
/
texgetimage.c
diff --git
a/src/mesa/main/texgetimage.c
b/src/mesa/main/texgetimage.c
index c94f88e16e68e8f7a81447d2b01b47f5f1cf6931..da610798e1232822da5eb0d6e7416731bc68197e 100644
(file)
--- a/
src/mesa/main/texgetimage.c
+++ b/
src/mesa/main/texgetimage.c
@@
-35,6
+35,8
@@
#include "context.h"
#include "formats.h"
#include "image.h"
#include "context.h"
#include "formats.h"
#include "image.h"
+#include "mfeatures.h"
+#include "mtypes.h"
#include "pack.h"
#include "texgetimage.h"
#include "teximage.h"
#include "pack.h"
#include "texgetimage.h"
#include "teximage.h"
@@
-432,11
+434,21
@@
get_tex_memcpy(struct gl_context *ctx, GLenum format, GLenum type, GLvoid *pixel
type == GL_UNSIGNED_BYTE) {
memCopy = GL_TRUE;
}
type == GL_UNSIGNED_BYTE) {
memCopy = GL_TRUE;
}
+ else if (texImage->TexFormat == MESA_FORMAT_L16 &&
+ format == GL_LUMINANCE &&
+ type == GL_UNSIGNED_SHORT) {
+ memCopy = GL_TRUE;
+ }
else if (texImage->TexFormat == MESA_FORMAT_A8 &&
format == GL_ALPHA &&
type == GL_UNSIGNED_BYTE) {
memCopy = GL_TRUE;
}
else if (texImage->TexFormat == MESA_FORMAT_A8 &&
format == GL_ALPHA &&
type == GL_UNSIGNED_BYTE) {
memCopy = GL_TRUE;
}
+ else if (texImage->TexFormat == MESA_FORMAT_A16 &&
+ format == GL_ALPHA &&
+ type == GL_UNSIGNED_SHORT) {
+ memCopy = GL_TRUE;
+ }
}
if (memCopy) {
}
if (memCopy) {