Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-08 05:44:09 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Cleanup vector batch in D3D (nw)

Browse Source
This commit is contained in:
ImJezze 2016-05-29 14:11:48 +02:00
parent 5da7690669
commit 0c83e22fe0
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/osd/modules/render/drawd3d.cpp
View File

@ -535,7 +535,7 @@ renderer_d3d9::renderer_d3d9(std::shared_ptr<osd_window> window)
: osd_renderer(window, FLAG_NONE), m_adapter(0), m_width(0), m_height(0), m_refresh(0), m_create_error_count(0), m_device(nullptr), m_gamma_supported(0), m_pixformat(), : osd_renderer(window, FLAG_NONE), m_adapter(0), m_width(0), m_height(0), m_refresh(0), m_create_error_count(0), m_device(nullptr), m_gamma_supported(0), m_pixformat(),
m_vertexbuf(nullptr), m_lockedbuf(nullptr), m_numverts(0), m_vectorbatch(nullptr), m_batchindex(0), m_numpolys(0), m_restarting(false), m_mod2x_supported(0), m_mod4x_supported(0), m_vertexbuf(nullptr), m_lockedbuf(nullptr), m_numverts(0), m_vectorbatch(nullptr), m_batchindex(0), m_numpolys(0), m_restarting(false), m_mod2x_supported(0), m_mod4x_supported(0),
m_screen_format(), m_last_texture(nullptr), m_last_texture_flags(0), m_last_blendenable(0), m_last_blendop(0), m_last_blendsrc(0), m_last_blenddst(0), m_last_filter(0), m_screen_format(), m_last_texture(nullptr), m_last_texture_flags(0), m_last_blendenable(0), m_last_blendop(0), m_last_blendsrc(0), m_last_blenddst(0), m_last_filter(0),
m_last_wrap(), m_last_modmode(0), m_hlsl_buf(nullptr), m_shaders(nullptr), m_shaders_options(nullptr), m_texture_manager(nullptr), m_line_count(0) m_last_wrap(), m_last_modmode(0), m_hlsl_buf(nullptr), m_shaders(nullptr), m_shaders_options(nullptr), m_texture_manager(nullptr)
{ {
} }
@ -679,22 +679,22 @@ void renderer_d3d9::begin_frame()
m_hlsl_buf = (void*)mesh_alloc(6); m_hlsl_buf = (void*)mesh_alloc(6);
m_shaders->init_fsfx_quad(m_hlsl_buf); m_shaders->init_fsfx_quad(m_hlsl_buf);
} }
// loop over line primitives
m_line_count = 0;
for (render_primitive &prim : *win->m_primlist)
{
if (prim.type == render_primitive::LINE && PRIMFLAG_GET_VECTOR(prim.flags))
{
m_line_count++;
}
}
} }
void renderer_d3d9::process_primitives() void renderer_d3d9::process_primitives()
{ {
auto win = assert_window(); auto win = assert_window();
// loop over line primitives
int vector_count = 0;
for (render_primitive &prim : *win->m_primlist)
{
if (prim.type == render_primitive::LINE && PRIMFLAG_GET_VECTOR(prim.flags))
{
vector_count++;
}
}
// Rotating index for vector time offsets // Rotating index for vector time offsets
for (render_primitive &prim : *win->m_primlist) for (render_primitive &prim : *win->m_primlist)
{ {
@ -703,10 +703,11 @@ void renderer_d3d9::process_primitives()
case render_primitive::LINE: case render_primitive::LINE:
if (PRIMFLAG_GET_VECTOR(prim.flags)) if (PRIMFLAG_GET_VECTOR(prim.flags))
{ {
if (m_line_count > 0) if (vector_count > 0)
batch_vectors(); {
else batch_vectors(vector_count);
continue; vector_count = 0;
}
} }
else else
{ {
@ -1383,7 +1384,7 @@ int renderer_d3d9::update_window_size()
// batch_vectors // batch_vectors
//============================================================ //============================================================
void renderer_d3d9::batch_vectors() void renderer_d3d9::batch_vectors(int vector_count)
{ {
auto win = assert_window(); auto win = assert_window();
@ -1392,8 +1393,9 @@ void renderer_d3d9::batch_vectors()
float quad_width = 0.0f; float quad_width = 0.0f;
float quad_height = 0.0f; float quad_height = 0.0f;
int vector_size = (options.antialias() ? 24 : 6); int vertex_count = vector_count * (options.antialias() ? 24 : 6);
m_vectorbatch = mesh_alloc(m_line_count * vector_size); int triangle_count = vector_count * (options.antialias() ? 8 : 2);
m_vectorbatch = mesh_alloc(vertex_count);
m_batchindex = 0; m_batchindex = 0;
UINT32 cached_flags = 0; UINT32 cached_flags = 0;
@ -1491,11 +1493,8 @@ void renderer_d3d9::batch_vectors()
} }
// now add a polygon entry // now add a polygon entry
m_poly[m_numpolys].init(D3DPT_TRIANGLELIST, m_line_count * (options.antialias() ? 8 : 2), vector_size * m_line_count, cached_flags, m_poly[m_numpolys].init(D3DPT_TRIANGLELIST, triangle_count, vertex_count, cached_flags, nullptr, D3DTOP_MODULATE, 0.0f, 1.0f, quad_width, quad_height);
nullptr, D3DTOP_MODULATE, 0.0f, 1.0f, quad_width, quad_height);
m_numpolys++; m_numpolys++;
m_line_count = 0;
} }
void renderer_d3d9::batch_vector(const render_primitive &prim) void renderer_d3d9::batch_vector(const render_primitive &prim)

4
src/osd/modules/render/drawd3d.h
View File

@ -76,7 +76,7 @@ public:
void draw_line(const render_primitive &prim); void draw_line(const render_primitive &prim);
void draw_quad(const render_primitive &prim); void draw_quad(const render_primitive &prim);
void batch_vector(const render_primitive &prim); void batch_vector(const render_primitive &prim);
void batch_vectors(); void batch_vectors(int vector_count);
vertex * mesh_alloc(int numverts); vertex * mesh_alloc(int numverts);
@ -165,8 +165,6 @@ private:
hlsl_options * m_shaders_options; // HLSL options hlsl_options * m_shaders_options; // HLSL options
d3d_texture_manager * m_texture_manager; // texture manager d3d_texture_manager * m_texture_manager; // texture manager
int m_line_count;
}; };
#endif // OSD_WINDOWS #endif // OSD_WINDOWS