From cc4964847b00a20c98a8f3a2ce02be1f83a9fd95 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 6 Dec 2021 17:36:11 +1000 Subject: [PATCH] mesa/st: move rendermode to direct call MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Acked-by: Marek Olšák Part-of: --- src/mesa/main/dd.h | 2 -- src/mesa/main/feedback.c | 4 ++-- src/mesa/state_tracker/st_cb_feedback.c | 9 +-------- src/mesa/state_tracker/st_cb_feedback.h | 8 ++------ src/mesa/state_tracker/st_context.c | 1 - 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 1d07e15..59cdc10 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -656,8 +656,6 @@ struct dd_function_table { void (*Enable)(struct gl_context *ctx, GLenum cap, GLboolean state); /* Specifies the current buffer for reading */ void (*ReadBuffer)( struct gl_context *ctx, GLenum buffer ); - /** Set rasterization mode */ - void (*RenderMode)(struct gl_context *ctx, GLenum mode ); /** Set texture parameter (callee gets param value from the texObj) */ void (*TexParameter)(struct gl_context *ctx, struct gl_texture_object *texObj, GLenum pname); diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c index b6776a1..eda6521 100644 --- a/src/mesa/main/feedback.c +++ b/src/mesa/main/feedback.c @@ -36,6 +36,7 @@ #include "macros.h" #include "mtypes.h" +#include "state_tracker/st_cb_feedback.h" #define FB_3D 0x01 #define FB_4D 0x02 @@ -477,8 +478,7 @@ _mesa_RenderMode( GLenum mode ) } ctx->RenderMode = mode; - if (ctx->Driver.RenderMode) - ctx->Driver.RenderMode( ctx, mode ); + st_RenderMode( ctx, mode ); return result; } diff --git a/src/mesa/state_tracker/st_cb_feedback.c b/src/mesa/state_tracker/st_cb_feedback.c index e3157f4..73c7386 100644 --- a/src/mesa/state_tracker/st_cb_feedback.c +++ b/src/mesa/state_tracker/st_cb_feedback.c @@ -274,7 +274,7 @@ draw_glselect_stage(struct gl_context *ctx, struct draw_context *draw) } -static void +void st_RenderMode(struct gl_context *ctx, GLenum newMode ) { struct st_context *st = st_context(ctx); @@ -311,10 +311,3 @@ st_RenderMode(struct gl_context *ctx, GLenum newMode ) st->dirty |= ST_NEW_VERTEX_PROGRAM(st, st_program(vp)); } } - - - -void st_init_feedback_functions(struct dd_function_table *functions) -{ - functions->RenderMode = st_RenderMode; -} diff --git a/src/mesa/state_tracker/st_cb_feedback.h b/src/mesa/state_tracker/st_cb_feedback.h index 14bda63..145694e 100644 --- a/src/mesa/state_tracker/st_cb_feedback.h +++ b/src/mesa/state_tracker/st_cb_feedback.h @@ -29,11 +29,7 @@ #ifndef ST_CB_FEEDBACK_H #define ST_CB_FEEDBACK_H - -struct dd_function_table; - -extern void -st_init_feedback_functions(struct dd_function_table *functions); - +void +st_RenderMode(struct gl_context *ctx, GLenum newMode ); #endif /* ST_CB_FEEDBACK_H */ diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index d7e39e4..0eb6766 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -950,7 +950,6 @@ st_init_driver_functions(struct pipe_screen *screen, st_init_eglimage_functions(functions, has_egl_image_validate); st_init_fbo_functions(functions); - st_init_feedback_functions(functions); st_init_msaa_functions(functions); st_init_perfmon_functions(functions); st_init_perfquery_functions(functions); -- 2.7.4