AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/nine: Use offset_units_unscaled

Browse Source 
offset_units_unscaled enables proper support
for depth bias for gallium nine. Use it
if available.

Solves issues with some games using depth bias.
For example:
https://github.com/iXit/Mesa-3D/issues/220

Signed-off-by: Axel Davy <axel.davy@ens.fr>
This commit is contained in:
Axel Davy
2016-06-14 23:24:24 +02:00
parent f6704f2a4d
commit b76fa56739
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/nine/device9.c
+1
View File
@@ -427,6 +427,7 @@ NineDevice9_ctor( struct NineDevice9 *This,
This->driver_caps.window_space_position_support = GET_PCAP(TGSI_VS_WINDOW_SPACE_POSITION);
This->driver_caps.vs_integer = pScreen->get_shader_param(pScreen, PIPE_SHADER_VERTEX, PIPE_SHADER_CAP_INTEGERS);
This->driver_caps.ps_integer = pScreen->get_shader_param(pScreen, PIPE_SHADER_FRAGMENT, PIPE_SHADER_CAP_INTEGERS);
This->driver_caps.offset_units_unscaled = GET_PCAP(POLYGON_OFFSET_UNITS_UNSCALED);
nine_ff_init(This); /* initialize fixed function code */
src/gallium/state_trackers/nine/device9.h
+1
View File
@@ -121,6 +121,7 @@ struct NineDevice9
boolean window_space_position_support;
boolean vs_integer;
boolean ps_integer;
boolean offset_units_unscaled;
} driver_caps;
struct {
src/gallium/state_trackers/nine/nine_pipe.c
+9 -9
View File
@@ -70,7 +70,9 @@ nine_convert_dsa_state(struct pipe_depth_stencil_alpha_state *dsa_state,
}
void
nine_convert_rasterizer_state(struct pipe_rasterizer_state *rast_state, const DWORD *rs)
nine_convert_rasterizer_state(struct NineDevice9 *device,
struct pipe_rasterizer_state *rast_state,
const DWORD *rs)
{
struct pipe_rasterizer_state rast;
@@ -120,14 +122,12 @@ nine_convert_rasterizer_state(struct pipe_rasterizer_state *rast_state, const DW
/* offset_units has the ogl/d3d11 meaning.
* d3d9: offset = scale * dz + bias
* ogl/d3d11: offset = scale * dz + r * bias
* with r implementation dependant and is supposed to be
* the smallest value the depth buffer format can hold.
* In practice on current and past hw it seems to be 2^-23
* for all formats except float formats where it varies depending
* on the content.
* For now use 1 << 23, but in the future perhaps add a way in gallium
* to get r for the format or get the gallium behaviour */
rast.offset_units = asfloat(rs[D3DRS_DEPTHBIAS]) * (float)(1 << 23);
* with r implementation dependent (+ different formula for float depth
* buffers). r=2^-23 is often the right value for gallium drivers.
* If possible, use offset_units_unscaled, which gives the d3d9
* behaviour, else scale by 1 << 23 */
rast.offset_units = asfloat(rs[D3DRS_DEPTHBIAS]) * (device->driver_caps.offset_units_unscaled ? 1.0f : (float)(1 << 23));
rast.offset_units_unscaled = device->driver_caps.offset_units_unscaled;
rast.offset_scale = asfloat(rs[D3DRS_SLOPESCALEDEPTHBIAS]);
/* rast.offset_clamp = 0.0f; */
src/gallium/state_trackers/nine/nine_pipe.h
+1 -1
View File
@@ -38,7 +38,7 @@ extern const enum pipe_format nine_d3d9_to_pipe_format_map[120];
extern const D3DFORMAT nine_pipe_to_d3d9_format_map[PIPE_FORMAT_COUNT];
void nine_convert_dsa_state(struct pipe_depth_stencil_alpha_state *, const DWORD *);
void nine_convert_rasterizer_state(struct pipe_rasterizer_state *, const DWORD *);
void nine_convert_rasterizer_state(struct NineDevice9 *, struct pipe_rasterizer_state *, const DWORD *);
void nine_convert_blend_state(struct pipe_blend_state *, const DWORD *);
void nine_convert_sampler_state(struct cso_context *, int idx, const DWORD *);
src/gallium/state_trackers/nine/nine_state.c
+1 -1
View File
@@ -74,7 +74,7 @@ prepare_dsa(struct NineDevice9 *device)
static inline void
prepare_rasterizer(struct NineDevice9 *device)
{
nine_convert_rasterizer_state(&device->state.pipe.rast, device->state.rs);
nine_convert_rasterizer_state(device, &device->state.pipe.rast, device->state.rs);
device->state.commit |= NINE_STATE_COMMIT_RASTERIZER;
}