fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa/st: move rendermode to direct call

Browse source 
Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14100>
This commit is contained in:
Dave Airlie 2021-12-06 17:36:11 +10:00 • committed by Marge Bot
parent cdc480585c
commit cc4964847b
5 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -656,8 +656,6 @@ struct dd_function_table {
void (*Enable)(struct gl_context *ctx, GLenum cap, GLboolean state); void (*Enable)(struct gl_context *ctx, GLenum cap, GLboolean state);
/* Specifies the current buffer for reading */ /* Specifies the current buffer for reading */
void (*ReadBuffer)( struct gl_context *ctx, GLenum buffer ); 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) */ /** Set texture parameter (callee gets param value from the texObj) */
void (*TexParameter)(struct gl_context *ctx, void (*TexParameter)(struct gl_context *ctx,
struct gl_texture_object *texObj, GLenum pname); struct gl_texture_object *texObj, GLenum pname);

4
src/mesa/main/feedback.c
View file

@ -36,6 +36,7 @@
#include "macros.h" #include "macros.h"
#include "mtypes.h" #include "mtypes.h"
#include "state_tracker/st_cb_feedback.h"
#define FB_3D 0x01 #define FB_3D 0x01
#define FB_4D 0x02 #define FB_4D 0x02
@ -477,8 +478,7 @@ _mesa_RenderMode( GLenum mode )
} }
ctx->RenderMode = mode; ctx->RenderMode = mode;
if (ctx->Driver.RenderMode) st_RenderMode( ctx, mode );
ctx->Driver.RenderMode( ctx, mode );
return result; return result;
} }

9
src/mesa/state_tracker/st_cb_feedback.c
View file

@ -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 ) st_RenderMode(struct gl_context *ctx, GLenum newMode )
{ {
struct st_context *st = st_context(ctx); 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)); st->dirty |= ST_NEW_VERTEX_PROGRAM(st, st_program(vp));
} }
} }
void st_init_feedback_functions(struct dd_function_table *functions)
{
functions->RenderMode = st_RenderMode;
}

8
src/mesa/state_tracker/st_cb_feedback.h
View file

@ -29,11 +29,7 @@
#ifndef ST_CB_FEEDBACK_H #ifndef ST_CB_FEEDBACK_H
#define ST_CB_FEEDBACK_H #define ST_CB_FEEDBACK_H
void
struct dd_function_table; st_RenderMode(struct gl_context *ctx, GLenum newMode );
extern void
st_init_feedback_functions(struct dd_function_table *functions);
#endif /* ST_CB_FEEDBACK_H */ #endif /* ST_CB_FEEDBACK_H */

1
src/mesa/state_tracker/st_context.c
View file

@ -950,7 +950,6 @@ st_init_driver_functions(struct pipe_screen *screen,
st_init_eglimage_functions(functions, has_egl_image_validate); st_init_eglimage_functions(functions, has_egl_image_validate);
st_init_fbo_functions(functions); st_init_fbo_functions(functions);
st_init_feedback_functions(functions);
st_init_msaa_functions(functions); st_init_msaa_functions(functions);
st_init_perfmon_functions(functions); st_init_perfmon_functions(functions);
st_init_perfquery_functions(functions); st_init_perfquery_functions(functions);