izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

nv2a/glsl: Factor out geometry state to GeomState

Browse Source
This commit is contained in:
Matt Borgerson
2025-06-28 00:18:28 -07:00
committed by mborgerson
parent c29546e2e1
commit cbcb7c2181
9 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hw/xbox/nv2a/pgraph/gl/shaders.c
+4 -4
View File
@@ -145,9 +145,9 @@ static void generate_shaders(ShaderBinding *binding)
/* Create an optional geometry shader and find primitive type */
GLenum gl_primitive_mode = get_gl_primitive_mode(
state->vsh.polygon_front_mode, state->vsh.primitive_mode);
state->geom.polygon_front_mode, state->geom.primitive_mode);
MString *geometry_shader_code =
pgraph_gen_geom_glsl(&state->vsh, (GenGeomGlslOptions){ 0 });
pgraph_gen_geom_glsl(&state->geom, (GenGeomGlslOptions){ 0 });
if (geometry_shader_code) {
const char* geometry_shader_code_str =
mstring_get_str(geometry_shader_code);
@@ -303,8 +303,8 @@ bool pgraph_gl_shader_load_from_memory(ShaderBinding *binding)
binding->gl_program = gl_program;
binding->gl_primitive_mode =
get_gl_primitive_mode(binding->state.vsh.polygon_front_mode,
binding->state.vsh.primitive_mode);
get_gl_primitive_mode(binding->state.geom.polygon_front_mode,
binding->state.geom.primitive_mode);
binding->initialized = true;
g_free(binding->program);
hw/xbox/nv2a/pgraph/glsl/geom.c
+19 -2
View File
@@ -19,10 +19,27 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "common.h"
#include "qemu/osdep.h"
#include "hw/xbox/nv2a/pgraph/pgraph.h"
#include "geom.h"
MString *pgraph_gen_geom_glsl(const VshState *state, GenGeomGlslOptions opts)
void pgraph_set_geom_state(PGRAPHState *pg, GeomState *state)
{
state->primitive_mode = (enum ShaderPrimitiveMode)pg->primitive_mode;
state->polygon_front_mode = (enum ShaderPolygonMode)GET_MASK(
pgraph_reg_r(pg, NV_PGRAPH_SETUPRASTER),
NV_PGRAPH_SETUPRASTER_FRONTFACEMODE);
state->polygon_back_mode = (enum ShaderPolygonMode)GET_MASK(
pgraph_reg_r(pg, NV_PGRAPH_SETUPRASTER),
NV_PGRAPH_SETUPRASTER_BACKFACEMODE);
state->smooth_shading = GET_MASK(pgraph_reg_r(pg, NV_PGRAPH_CONTROL_3),
NV_PGRAPH_CONTROL_3_SHADEMODE) ==
NV_PGRAPH_CONTROL_3_SHADEMODE_SMOOTH;
}
MString *pgraph_gen_geom_glsl(const GeomState *state, GenGeomGlslOptions opts)
{
/* FIXME: Missing support for 2-sided-poly mode */
assert(state->polygon_front_mode == state->polygon_back_mode);
hw/xbox/nv2a/pgraph/glsl/geom.h
+12 -3
View File
@@ -22,13 +22,22 @@
#ifndef HW_XBOX_NV2A_PGRAPH_GLSL_GEOM_H
#define HW_XBOX_NV2A_PGRAPH_GLSL_GEOM_H
#include "qemu/mstring.h"
#include "vsh.h"
#include "common.h"
#include "hw/xbox/nv2a/pgraph/vsh_regs.h"
typedef struct {
enum ShaderPrimitiveMode primitive_mode;
enum ShaderPolygonMode polygon_front_mode;
enum ShaderPolygonMode polygon_back_mode;
bool smooth_shading;
} GeomState;
typedef struct GenGeomGlslOptions {
bool vulkan;
} GenGeomGlslOptions;
MString *pgraph_gen_geom_glsl(const VshState *state, GenGeomGlslOptions opts);
void pgraph_set_geom_state(PGRAPHState *pg, GeomState *geom);
MString *pgraph_gen_geom_glsl(const GeomState *state, GenGeomGlslOptions opts);
#endif
hw/xbox/nv2a/pgraph/glsl/shaders.c
+2 -1
View File
@@ -30,6 +30,7 @@ ShaderState pgraph_get_shader_state(PGRAPHState *pg)
memset(&state, 0, sizeof(ShaderState));
pgraph_set_vsh_state(pg, &state.vsh);
pgraph_set_geom_state(pg, &state.geom);
pgraph_set_psh_state(pg, &state.psh);
return state;
@@ -70,7 +71,7 @@ bool pgraph_check_shader_state_dirty(PGRAPHState *pg, const ShaderState *state)
if (pg->uniform_attrs != state->vsh.uniform_attrs ||
pg->swizzle_attrs != state->vsh.swizzle_attrs ||
pg->compressed_attrs != state->vsh.compressed_attrs ||
pg->primitive_mode != state->vsh.primitive_mode ||
pg->primitive_mode != state->geom.primitive_mode ||
pg->surface_scale_factor != state->vsh.surface_scale_factor) {
return true;
}
hw/xbox/nv2a/pgraph/glsl/shaders.h
+2 -1
View File
@@ -20,12 +20,13 @@
#ifndef HW_XBOX_NV2A_PGRAPH_GLSL_SHADERS_H
#define HW_XBOX_NV2A_PGRAPH_GLSL_SHADERS_H
#include "geom.h"
#include "vsh.h"
#include "geom.h"
#include "psh.h"
typedef struct ShaderState {
VshState vsh;
GeomState geom;
PshState psh;
} ShaderState;
hw/xbox/nv2a/pgraph/glsl/vsh.c
-9
View File
@@ -153,15 +153,6 @@ void pgraph_set_vsh_state(PGRAPHState *pg, VshState *vsh)
NV_PGRAPH_CONTROL_3_FOG_MODE);
}
/* geometry shader stuff */
vsh->primitive_mode = (enum ShaderPrimitiveMode)pg->primitive_mode;
vsh->polygon_front_mode = (enum ShaderPolygonMode)GET_MASK(
pgraph_reg_r(pg, NV_PGRAPH_SETUPRASTER),
NV_PGRAPH_SETUPRASTER_FRONTFACEMODE);
vsh->polygon_back_mode = (enum ShaderPolygonMode)GET_MASK(
pgraph_reg_r(pg, NV_PGRAPH_SETUPRASTER),
NV_PGRAPH_SETUPRASTER_BACKFACEMODE);
vsh->is_fixed_function = fixed_function;
if (fixed_function) {
set_fixed_function_vsh_state(pg, &vsh->fixed_function);
hw/xbox/nv2a/pgraph/glsl/vsh.h
-5
View File
@@ -54,11 +54,6 @@ typedef struct {
uint16_t uniform_attrs;
uint16_t swizzle_attrs;
/* primitive format for geometry shader */
enum ShaderPolygonMode polygon_front_mode;
enum ShaderPolygonMode polygon_back_mode;
enum ShaderPrimitiveMode primitive_mode;
bool fog_enable;
enum VshFogMode fog_mode;
hw/xbox/nv2a/pgraph/vk/draw.c
+7 -7
View File
@@ -51,8 +51,8 @@ static VkPrimitiveTopology get_primitive_topology(PGRAPHState *pg)
{
PGRAPHVkState *r = pg->vk_renderer_state;
int polygon_mode = r->shader_binding->state.vsh.polygon_front_mode;
int primitive_mode = r->shader_binding->state.vsh.primitive_mode;
int polygon_mode = r->shader_binding->state.geom.polygon_front_mode;
int primitive_mode = r->shader_binding->state.geom.primitive_mode;
if (polygon_mode == POLY_MODE_POINT) {
return VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
@@ -816,7 +816,7 @@ static void create_pipeline(PGRAPHState *pg)
.depthClampEnable = VK_TRUE,
.rasterizerDiscardEnable = VK_FALSE,
.polygonMode = pgraph_polygon_mode_vk_map[r->shader_binding->state
.vsh.polygon_front_mode],
.geom.polygon_front_mode],
.lineWidth = 1.0f,
.frontFace = (pgraph_reg_r(pg, NV_PGRAPH_SETUPRASTER) &
NV_PGRAPH_SETUPRASTER_FRONTFACE) ?
@@ -952,10 +952,10 @@ static void create_pipeline(PGRAPHState *pg)
snode->has_dynamic_line_width =
(r->enabled_physical_device_features.wideLines == VK_TRUE) &&
(r->shader_binding->state.vsh.polygon_front_mode == POLY_MODE_LINE ||
r->shader_binding->state.vsh.primitive_mode == PRIM_TYPE_LINES ||
r->shader_binding->state.vsh.primitive_mode == PRIM_TYPE_LINE_LOOP ||
r->shader_binding->state.vsh.primitive_mode == PRIM_TYPE_LINE_STRIP);
(r->shader_binding->state.geom.polygon_front_mode == POLY_MODE_LINE ||
r->shader_binding->state.geom.primitive_mode == PRIM_TYPE_LINES ||
r->shader_binding->state.geom.primitive_mode == PRIM_TYPE_LINE_LOOP ||
r->shader_binding->state.geom.primitive_mode == PRIM_TYPE_LINE_STRIP);
if (snode->has_dynamic_line_width) {
dynamic_states[num_dynamic_states++] = VK_DYNAMIC_STATE_LINE_WIDTH;
}
hw/xbox/nv2a/pgraph/vk/shaders.c
+1 -1
View File
@@ -329,7 +329,7 @@ static ShaderBinding *gen_shaders(PGRAPHState *pg, ShaderState *state)
setlocale(LC_NUMERIC, "C");
MString *geometry_shader_code = pgraph_gen_geom_glsl(
&state->vsh, (GenGeomGlslOptions){ .vulkan = true });
&state->geom, (GenGeomGlslOptions){ .vulkan = true });
if (geometry_shader_code) {
NV2A_VK_DPRINTF("geometry shader: \n%s",
mstring_get_str(geometry_shader_code));