fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 15:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa/dd: remove some fbo driver hooks.

Browse source 
These are assign to core mesa functions by st, so just direct call

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14074>
This commit is contained in:
Dave Airlie 2021-12-06 15:43:57 +10:00
parent 279471bda6
commit 67f971e6ad
4 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/main/dd.h
View file

@ -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);

15
src/mesa/main/fbobject.c
View file

@ -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);
}
}

6
src/mesa/main/fbobject.h
View file

@ -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,

2
src/mesa/state_tracker/st_cb_fbo.c
View file

@ -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;