fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-02 19:58:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

d3d1x: add untested support for geometry shader translation

Browse source
This commit is contained in:
Luca Barbieri 2010-09-23 18:03:34 +02:00
parent f71f8c7d18
commit 4babdc7844
5 changed files with 75 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
View file

@ -62,6 +62,12 @@ extern "C"
#undef max
#endif
#define D3D_PRIMITIVE_TOPOLOGY_COUNT 65
extern unsigned d3d_to_pipe_prim[D3D_PRIMITIVE_TOPOLOGY_COUNT];
#define D3D_PRIMITIVE_COUNT 40
extern unsigned d3d_to_pipe_prim_type[D3D_PRIMITIVE_COUNT];
/* NOTE: this _depends_ on the vtable layout of the C++ compiler to be
* binary compatible with Windows.
* Furthermore some absurd vtable layout likely won't work at all, since

42
src/gallium/state_trackers/d3d1x/d3d1xstutil/src/d3d_sm4_enums.cpp Normal file
View file

@ -0,0 +1,42 @@
#include "d3d1xstutil.h"
unsigned d3d_to_pipe_prim[D3D_PRIMITIVE_TOPOLOGY_COUNT] =
{
0,
PIPE_PRIM_POINTS,
PIPE_PRIM_LINES,
PIPE_PRIM_LINE_STRIP,
PIPE_PRIM_TRIANGLES,
PIPE_PRIM_TRIANGLE_STRIP,
PIPE_PRIM_LINES_ADJACENCY,
PIPE_PRIM_LINE_STRIP_ADJACENCY,
PIPE_PRIM_TRIANGLES_ADJACENCY,
PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY,
/* gap */
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0,
/* patches */
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
unsigned d3d_to_pipe_prim_type[D3D_PRIMITIVE_COUNT] =
{
0,
PIPE_PRIM_POINTS,
PIPE_PRIM_LINES,
PIPE_PRIM_TRIANGLES,
0,
PIPE_PRIM_POINTS,
PIPE_PRIM_LINES_ADJACENCY,
PIPE_PRIM_TRIANGLES_ADJACENCY,
/* patches */
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};

3
src/gallium/state_trackers/d3d1x/gd3d1x/d3d1x_private.h
View file

@ -92,7 +92,4 @@ extern unsigned d3d11_to_pipe_wrap[D3D11_TEXTURE_ADDRESS_COUNT];
extern unsigned d3d11_to_pipe_query[D3D11_QUERY_COUNT];
extern unsigned d3d11_query_size[D3D11_QUERY_COUNT];
#define D3D_PRIMITIVE_TOPOLOGY_COUNT 65
extern unsigned d3d_to_pipe_prim[D3D_PRIMITIVE_TOPOLOGY_COUNT];
#endif /* D3D1X_H_ */

24
src/gallium/state_trackers/d3d1x/gd3d1x/d3d_enums.cpp
View file

@ -121,27 +121,3 @@ unsigned d3d11_query_size[D3D11_QUERY_COUNT] =
0,
0
};
unsigned d3d_to_pipe_prim[D3D_PRIMITIVE_TOPOLOGY_COUNT] =
{
0,
PIPE_PRIM_POINTS,
PIPE_PRIM_LINES,
PIPE_PRIM_LINE_STRIP,
PIPE_PRIM_TRIANGLES,
PIPE_PRIM_TRIANGLE_STRIP,
PIPE_PRIM_LINES_ADJACENCY,
PIPE_PRIM_LINE_STRIP_ADJACENCY,
PIPE_PRIM_TRIANGLES_ADJACENCY,
PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY,
/* gap */
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0,
/* patches */
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};

31
src/gallium/state_trackers/d3d1x/gd3d1x/sm4_to_tgsi.cpp
View file

@ -24,6 +24,7 @@
*
**************************************************************************/
#include "d3d1xstutil.h"
#include "sm4.h"
#include "tgsi/tgsi_ureg.h"
#include <vector>
@ -137,9 +138,16 @@ struct sm4_to_tgsi_converter
s = ureg_imm4f(ureg, op.imm_values[0].f32, op.imm_values[1].f32, op.imm_values[2].f32, op.imm_values[3].f32);
break;
case SM4_FILE_INPUT:
check(op.has_simple_index());
check(op.indices[0].disp < inputs.size());
s = inputs[op.indices[0].disp];
check(op.is_index_simple(0));
check(op.num_indices == 1 || op.num_indices == 2);
// TODO: is this correct, or are incorrectly swapping the two indices in the GS case?
check(op.indices[op.num_indices - 1].disp < inputs.size());
s = inputs[op.indices[op.num_indices - 1].disp];
if(op.num_indices == 2)
{
s.Dimension = 1;
s.DimensionIndex = op.indices[0].disp;
}
break;
case SM4_FILE_CONSTANT_BUFFER:
// TODO: indirect addressing
@ -700,7 +708,7 @@ next:;
{
sm4_dcl& dcl = *program.dcls[insn_num];
int idx = -1;
if(dcl.op.get() && dcl.op->has_simple_index())
if(dcl.op.get() && dcl.op->is_index_simple(0))
idx = dcl.op->indices[0].disp;
switch(dcl.opcode)
{
@ -716,6 +724,12 @@ next:;
inputs.resize(idx + 1);
if(processor == TGSI_PROCESSOR_VERTEX)
inputs[idx] = ureg_DECL_vs_input(ureg, idx);
else if(processor == TGSI_PROCESSOR_GEOMETRY)
{
// TODO: is this correct?
unsigned gsidx = dcl.op->indices[1].disp;
inputs[gsidx] = ureg_DECL_gs_input(ureg, gsidx, TGSI_SEMANTIC_GENERIC, gsidx);
}
else
check(0);
break;
@ -792,6 +806,15 @@ next:;
idx = dcl.op->indices[0].disp;
ureg_DECL_constant2D(ureg, 0, (unsigned)dcl.op->indices[1].disp - 1, idx);
break;
case SM4_OPCODE_DCL_GS_INPUT_PRIMITIVE:
ureg_property_gs_input_prim(ureg, d3d_to_pipe_prim_type[dcl.dcl_gs_input_primitive.primitive]);
break;
case SM4_OPCODE_DCL_GS_OUTPUT_PRIMITIVE_TOPOLOGY:
ureg_property_gs_output_prim(ureg, d3d_to_pipe_prim[dcl.dcl_gs_output_primitive_topology.primitive_topology]);
break;
case SM4_OPCODE_DCL_MAX_OUTPUT_VERTEX_COUNT:
ureg_property_gs_max_vertices(ureg, dcl.num);
break;
default:
check(0);
}