summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorTopi Pohjolainen <[email protected]>2017-07-21 11:49:08 +0300
committerTopi Pohjolainen <[email protected]>2017-07-22 00:14:16 +0300
commit4aea4d6d64de81b2c00784aa69ca900fdbec3690 (patch)
tree8a19e481fbf4bba162c1975e842c4f88bba6228b /src/mesa
parentfbfc6a2f67f3b72fa6e86250925eb8f5005c75ae (diff)
main/teximage: Even on failure use valid format for init()
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 <[email protected]> Signed-off-by: Topi Pohjolainen <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/teximage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 5e13025ed1b..2132aaee76b 100644
--- 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);
}
}