mesa/st: move evaluate depth values into mesa

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14632>

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 3db7597..5b5283c 100644 (file)
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -5530,5 +5530,7 @@ _mesa_EvaluateDepthValuesARB(void)
       return;
    }
 
-   st_EvaluateDepthValues(ctx);
+   st_validate_state(st_context(ctx), ST_PIPELINE_UPDATE_FRAMEBUFFER);
+
+   ctx->pipe->evaluate_depth_buffer(ctx->pipe);
 }

diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 3b95404..9aa5b4b 100644 (file)
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -974,17 +974,3 @@ st_UnmapRenderbuffer(struct gl_context *ctx,
    pipe_texture_unmap(pipe, strb->transfer);
    strb->transfer = NULL;
 }
-
-
-/**
- * Called via ctx->Driver.EvaluateDepthValues.
- */
-void
-st_EvaluateDepthValues(struct gl_context *ctx)
-{
-   struct st_context *st = st_context(ctx);
-
-   st_validate_state(st, ST_PIPELINE_UPDATE_FRAMEBUFFER);
-
-   st->pipe->evaluate_depth_buffer(st->pipe);
-}

diff --git a/src/mesa/state_tracker/st_cb_fbo.h b/src/mesa/state_tracker/st_cb_fbo.h
index 3f698be..c39704e 100644 (file)
--- a/src/mesa/state_tracker/st_cb_fbo.h
+++ b/src/mesa/state_tracker/st_cb_fbo.h
@@ -132,5 +132,4 @@ void st_MapRenderbuffer(struct gl_context *ctx,
                         bool flip_y);
 void st_UnmapRenderbuffer(struct gl_context *ctx,
                           struct gl_renderbuffer *rb);
-void st_EvaluateDepthValues(struct gl_context *ctx);
 #endif /* ST_CB_FBO_H */