diff options
| author | Kristian H. Kristensen <[email protected]> | 2018-12-10 18:14:34 +0000 |
|---|---|---|
| committer | Kristian H. Kristensen <[email protected]> | 2018-12-10 15:09:07 -0800 |
| commit | c0de7c21a352dc5ea556df0397d0b34559bb89c2 (patch) | |
| tree | f5a29120dbcf752c7fc360c607fb5e93e9259518 /src/mesa | |
| parent | 9578dde1c8751fd5372bce0fce0a448259160650 (diff) | |
glapi: fixup EXT_multisampled_render_to_texture dispatch
There's a few missing and convoluted bits:
- FramebufferTexture2DMultisampleEXT
Missing sanity check, should be desktop="false"
- RenderbufferStorageMultisampleEXT
Missing sanity check, is aliased to RenderbufferStorageMultisample.
Thus it's set only when desktop GL or GLES2 v3.0+, while the extension
is GLES2 2.0+.
If we flip the aliasing we'll break indirect GLX, so loosen the version
to 2.0. Not perfect, yet this is the most sane thing I could think of.
v2: [Emil] Fixup RenderbufferStorageMultisampleEXT, commmit message
Cc: Kristian H. Kristensen <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108974
Fixes: 1b331ae505e ("mesa: Add core support for EXT_multisampled_render_to_texture{,2}")
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index fb2acfbdeea..307639a4a4e 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -2236,6 +2236,10 @@ const struct function gles2_functions_possible[] = { /* GL_NV_conservative_raster_pre_snap_triangles */ { "glConservativeRasterParameteriNV", 20, -1 }, + /* GL_EXT_multisampled_render_to_texture */ + { "glRenderbufferStorageMultisampleEXT", 20, -1 }, + { "glFramebufferTexture2DMultisampleEXT", 20, -1 }, + { NULL, 0, -1 } }; @@ -2330,7 +2334,7 @@ const struct function gles3_functions_possible[] = { // glProgramParameteri aliases glProgramParameteriEXT in GLES 2 // We check for the aliased -NV version in GLES 2 // { "glReadBuffer", 30, -1 }, - { "glRenderbufferStorageMultisample", 30, -1 }, + // glRenderbufferStorageMultisample aliases glRenderbufferStorageMultisampleEXT in GLES 2 { "glResumeTransformFeedback", 30, -1 }, { "glSamplerParameterf", 30, -1 }, { "glSamplerParameterfv", 30, -1 }, |