projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fbfc6a2
)
main/teximage: Even on failure use valid format for init()
author
Topi Pohjolainen
<topi.pohjolainen@intel.com>
Fri, 21 Jul 2017 08:49:08 +0000
(11:49 +0300)
committer
Topi Pohjolainen
<topi.pohjolainen@intel.com>
Fri, 21 Jul 2017 21:14:16 +0000
(
00:14
+0300)
Otherwise init_teximage_fields_ms() (called by
_mesa_init_teximage_fields()) will always assert as it can't
find valid base format.
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
src/mesa/main/teximage.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/teximage.c
b/src/mesa/main/teximage.c
index
5e13025
..
2132aae
100644
(file)
--- a/
src/mesa/main/teximage.c
+++ b/
src/mesa/main/teximage.c
@@
-5772,7
+5772,7
@@
texture_image_multisample(struct gl_context *ctx, GLuint dims,
* like, but being tidy is good.
*/
_mesa_init_teximage_fields(ctx, texImage,
- 0, 0, 0, 0,
GL_NONE, MESA_FORMAT_NONE
);
+ 0, 0, 0, 0,
internalformat, texFormat
);
}
}