Mesa (main): mesa/dd: remove some fbo driver hooks.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Dec 6 06:50:58 UTC 2021
Module: Mesa
Branch: main
Commit: 67f971e6ad089d2240863065c5754c5f66b2c716
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=67f971e6ad089d2240863065c5754c5f66b2c716
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Dec 6 15:43:57 2021 +1000
mesa/dd: remove some fbo driver hooks.
These are assign to core mesa functions by st, so just direct call
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14074>
---
src/mesa/main/dd.h | 6 ------
src/mesa/main/fbobject.c | 15 +++++++--------
src/mesa/main/fbobject.h | 6 ------
src/mesa/state_tracker/st_cb_fbo.c | 2 --
4 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 0d0f5c66745..a6e4dd35d0c 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -755,14 +755,8 @@ struct dd_function_table {
* \name Functions for GL_EXT_framebuffer_{object,blit,discard}.
*/
/*@{*/
- struct gl_framebuffer * (*NewFramebuffer)(struct gl_context *ctx,
- GLuint name);
struct gl_renderbuffer * (*NewRenderbuffer)(struct gl_context *ctx,
GLuint name);
- void (*FramebufferRenderbuffer)(struct gl_context *ctx,
- struct gl_framebuffer *fb,
- GLenum attachment,
- struct gl_renderbuffer *rb);
void (*RenderTexture)(struct gl_context *ctx,
struct gl_framebuffer *fb,
struct gl_renderbuffer_attachment *att);
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index b0846ae5678..d3a5149225b 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -171,12 +171,12 @@ _mesa_lookup_framebuffer_dsa(struct gl_context *ctx, GLuint id,
/* Name exists but buffer is not initialized */
if (fb == &DummyFramebuffer) {
- fb = ctx->Driver.NewFramebuffer(ctx, id);
+ fb = _mesa_new_framebuffer(ctx, id);
_mesa_HashInsert(ctx->Shared->FrameBuffers, id, fb, true);
}
/* Name doesn't exist */
else if (!fb) {
- fb = ctx->Driver.NewFramebuffer(ctx, id);
+ fb = _mesa_new_framebuffer(ctx, id);
if (!fb) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", func);
return NULL;
@@ -582,7 +582,7 @@ set_renderbuffer_attachment(struct gl_context *ctx,
* Fallback for ctx->Driver.FramebufferRenderbuffer()
* Attach a renderbuffer object to a framebuffer object.
*/
-void
+static void
_mesa_FramebufferRenderbuffer_sw(struct gl_context *ctx,
struct gl_framebuffer *fb,
GLenum attachment,
@@ -3120,7 +3120,7 @@ bind_framebuffer(GLenum target, GLuint framebuffer)
if (!newDrawFb) {
/* create new framebuffer object */
- newDrawFb = ctx->Driver.NewFramebuffer(ctx, framebuffer);
+ newDrawFb = _mesa_new_framebuffer(ctx, framebuffer);
if (!newDrawFb) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindFramebufferEXT");
return;
@@ -3282,7 +3282,7 @@ create_framebuffers(GLsizei n, GLuint *framebuffers, bool dsa)
for (i = 0; i < n; i++) {
if (dsa) {
- fb = ctx->Driver.NewFramebuffer(ctx, framebuffers[i]);
+ fb = _mesa_new_framebuffer(ctx, framebuffers[i]);
if (!fb) {
_mesa_HashUnlockMutex(ctx->Shared->FrameBuffers);
_mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", func);
@@ -4215,8 +4215,7 @@ _mesa_framebuffer_renderbuffer(struct gl_context *ctx,
FLUSH_VERTICES(ctx, _NEW_BUFFERS, 0);
- assert(ctx->Driver.FramebufferRenderbuffer);
- ctx->Driver.FramebufferRenderbuffer(ctx, fb, attachment, rb);
+ _mesa_FramebufferRenderbuffer_sw(ctx, fb, attachment, rb);
/* Some subsequent GL commands may depend on the framebuffer's visual
* after the binding is updated. Update visual info now.
@@ -4895,7 +4894,7 @@ lookup_named_framebuffer_ext_dsa(struct gl_context *ctx, GLuint framebuffer, con
}
/* Then, make sure it's initialized */
if (fb == &DummyFramebuffer) {
- fb = ctx->Driver.NewFramebuffer(ctx, framebuffer);
+ fb = _mesa_new_framebuffer(ctx, framebuffer);
_mesa_HashInsert(ctx->Shared->FrameBuffers, framebuffer, fb, true);
}
}
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 2a32c158e68..2a891514437 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -81,12 +81,6 @@ _mesa_update_texture_renderbuffer(struct gl_context *ctx,
struct gl_framebuffer *fb,
struct gl_renderbuffer_attachment *att);
-extern void
-_mesa_FramebufferRenderbuffer_sw(struct gl_context *ctx,
- struct gl_framebuffer *fb,
- GLenum attachment,
- struct gl_renderbuffer *rb);
-
extern void
_mesa_framebuffer_renderbuffer(struct gl_context *ctx,
struct gl_framebuffer *fb,
diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 5ffc234463c..ed6f225803c 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -993,9 +993,7 @@ st_EvaluateDepthValues(struct gl_context *ctx)
void
st_init_fbo_functions(struct dd_function_table *functions)
{
- functions->NewFramebuffer = _mesa_new_framebuffer;
functions->NewRenderbuffer = st_new_renderbuffer;
- functions->FramebufferRenderbuffer = _mesa_FramebufferRenderbuffer_sw;
functions->RenderTexture = st_render_texture;
functions->FinishRenderTexture = st_finish_render_texture;
functions->ValidateFramebuffer = st_validate_framebuffer;
More information about the mesa-commit
mailing list