summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers
diff options
context:
space:
mode:
authorHal Gentz <[email protected]>2019-09-15 15:29:50 -0600
committerDylan Baker <[email protected]>2019-09-23 11:11:59 -0700
commit6485fd83623099034727f14ba9253941fcfc6725 (patch)
treea52424353c441221f143c872997c283ac482130e /src/gallium/state_trackers
parent2d30c0fc5905c88f0208c2757e6e07976a8660c9 (diff)
gallium/osmesa: Fix the inability to set no context as current.
Currently there is no way to make no context current w/gallium + osmesa. The non-gallium version of osmesa does this if the context and buffer passed to `OSMesaMakeCurrent` are both null. This small change makes it so that this is also the case with the gallium version. Cc: [email protected] Signed-off-by: Hal Gentz <[email protected]> Reviewed-by: Eric Anholt <[email protected]> (cherry picked from commit 57c894334ee14c7075bc8c1fb8ff180631ccb527)
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r--src/gallium/state_trackers/osmesa/osmesa.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/osmesa/osmesa.c b/src/gallium/state_trackers/osmesa/osmesa.c
index 41ff9216fc6..97db3d15653 100644
--- a/src/gallium/state_trackers/osmesa/osmesa.c
+++ b/src/gallium/state_trackers/osmesa/osmesa.c
@@ -760,6 +760,11 @@ OSMesaMakeCurrent(OSMesaContext osmesa, void *buffer, GLenum type,
struct osmesa_buffer *osbuffer;
enum pipe_format color_format;
+ if (!osmesa && !buffer) {
+ stapi->make_current(stapi, NULL, NULL, NULL);
+ return GL_TRUE;
+ }
+
if (!osmesa || !buffer || width < 1 || height < 1) {
return GL_FALSE;
}