diff options
Diffstat (limited to 'src/osd/modules')
-rw-r--r-- | src/osd/modules/render/d3d/d3dhlsl.cpp | 26 | ||||
-rw-r--r-- | src/osd/modules/render/d3d/d3dhlsl.h | 6 |
2 files changed, 11 insertions, 21 deletions
diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp index c07622127cf..1e0f42a7bd8 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.cpp +++ b/src/osd/modules/render/d3d/d3dhlsl.cpp @@ -520,12 +520,10 @@ bool shaders::init(d3d_base *d3dintf, running_machine *machine, renderer_d3d9 *r get_vector(winoptions.screen_power(), 3, options->power, true); get_vector(winoptions.screen_floor(), 3, options->floor, true); options->phosphor_mode = winoptions.screen_phosphor_mode(); - get_vector(winoptions.screen_phosphor_tau(), 3, - options->phosphor_tau, true); + get_vector(winoptions.screen_phosphor_time(), 3, + options->phosphor_time, true); get_vector(winoptions.screen_phosphor_beta(), 3, options->phosphor_beta, true); - get_vector(winoptions.screen_phosphor_gamma(), 3, - options->phosphor_gamma, true); options->lcd_persistence = winoptions.screen_lcd_persistence(); options->saturation = winoptions.screen_saturation(); options->yiq_enable = winoptions.screen_yiq_enable(); @@ -795,9 +793,8 @@ int shaders::create_resources() focus_effect->add_uniform("Defocus", uniform::UT_VEC2, uniform::CU_FOCUS_SIZE); phosphor_effect->add_uniform("Mode", uniform::UT_INT, uniform::CU_PHOSPHOR_MODE); - phosphor_effect->add_uniform("Tau", uniform::UT_VEC3, uniform::CU_PHOSPHOR_TAU); + phosphor_effect->add_uniform("TimeConstant", uniform::UT_VEC3, uniform::CU_PHOSPHOR_TIME); phosphor_effect->add_uniform("Beta", uniform::UT_VEC3, uniform::CU_PHOSPHOR_BETA); - phosphor_effect->add_uniform("Gamma", uniform::UT_VEC3, uniform::CU_PHOSPHOR_GAMMA); phosphor_effect->add_uniform("LCDTau", uniform::UT_FLOAT, uniform::CU_LCD_PERSISTENCE); post_effect->add_uniform("ShadowAlpha", uniform::UT_FLOAT, uniform::CU_POST_SHADOW_ALPHA); @@ -1968,9 +1965,8 @@ enum slider_option SLIDER_POWER, SLIDER_FLOOR, SLIDER_PHOSPHOR_MODE, - SLIDER_PHOSPHOR_TAU, + SLIDER_PHOSPHOR_TIME, SLIDER_PHOSPHOR_BETA, - SLIDER_PHOSPHOR_GAMMA, SLIDER_LCD_PERSISTENCE, SLIDER_BLOOM_BLEND_MODE, SLIDER_BLOOM_SCALE, @@ -2051,9 +2047,8 @@ slider_desc shaders::s_sliders[] = { "Signal Exponent,", -800, 0, 800, 1, SLIDER_COLOR, SLIDER_SCREEN_TYPE_ANY, SLIDER_POWER, 0.01f, "%2.2f", {} }, { "Signal Floor,", 0, 0, 100, 1, SLIDER_COLOR, SLIDER_SCREEN_TYPE_ANY, SLIDER_FLOOR, 0.01f, "%2.2f", {} }, { "Phosphor Persistence Mode,", 0, 0, 2, 1, SLIDER_INT_ENUM, SLIDER_SCREEN_TYPE_RASTER_OR_VECTOR, SLIDER_PHOSPHOR_MODE, 0, "%s", { "Off", "Exponential", "Inverse Power" } }, - { "Phosphor Persistence tau,", 1, 26, 100, 1, SLIDER_COLOR, SLIDER_SCREEN_TYPE_RASTER_OR_VECTOR, SLIDER_PHOSPHOR_TAU, 0.001f, "%3.3f", {} }, - { "Phosphor Persistence beta,", 50, 70, 200, 1, SLIDER_COLOR, SLIDER_SCREEN_TYPE_RASTER_OR_VECTOR, SLIDER_PHOSPHOR_BETA, 0.01f, "%2.2f", {} }, - { "Phosphor Persistence gamma,", 1, 300, 1000, 1, SLIDER_COLOR, SLIDER_SCREEN_TYPE_RASTER_OR_VECTOR, SLIDER_PHOSPHOR_GAMMA, 1, "%.0f", {} }, + { "Phosphor Persistence Time Constant,",1, 5000, 10000,10, SLIDER_COLOR, SLIDER_SCREEN_TYPE_RASTER_OR_VECTOR, SLIDER_PHOSPHOR_TIME, 0.0001f, "%4.4f", {} }, + { "Phosphor Persistence beta,", 50, 100, 200, 1, SLIDER_COLOR, SLIDER_SCREEN_TYPE_RASTER_OR_VECTOR, SLIDER_PHOSPHOR_BETA, 0.01f, "%2.2f", {} }, { "LCD Perisistence,", 0, 20, 100, 1, SLIDER_FLOAT, SLIDER_SCREEN_TYPE_LCD, SLIDER_LCD_PERSISTENCE, 0.001f, "%3.3f", {} }, { "Bloom Blend Mode", 0, 0, 1, 1, SLIDER_INT_ENUM, SLIDER_SCREEN_TYPE_ANY, SLIDER_BLOOM_BLEND_MODE, 0, "%s", { "Brighten", "Darken" } }, { "Bloom Scale", 0, 0, 2000, 5, SLIDER_FLOAT, SLIDER_SCREEN_TYPE_ANY, SLIDER_BLOOM_SCALE, 0.001f, "%1.3f", {} }, @@ -2127,9 +2122,8 @@ void *shaders::get_slider_option(int id, int index) case SLIDER_POWER: return &(options->power[index]); case SLIDER_FLOOR: return &(options->floor[index]); case SLIDER_PHOSPHOR_MODE: return &(options->phosphor_mode); - case SLIDER_PHOSPHOR_TAU: return &(options->phosphor_tau[index]); + case SLIDER_PHOSPHOR_TIME: return &(options->phosphor_time[index]); case SLIDER_PHOSPHOR_BETA: return &(options->phosphor_beta[index]); - case SLIDER_PHOSPHOR_GAMMA: return &(options->phosphor_gamma[index]); case SLIDER_LCD_PERSISTENCE: return &(options->lcd_persistence); case SLIDER_BLOOM_BLEND_MODE: return &(options->bloom_blend_mode); case SLIDER_BLOOM_SCALE: return &(options->bloom_scale); @@ -2420,14 +2414,12 @@ void uniform::update() case CU_PHOSPHOR_MODE: m_shader->set_int("Mode", options->phosphor_mode); break; - case CU_PHOSPHOR_TAU: - m_shader->set_vector("Tau", 3, options->phosphor_tau); + case CU_PHOSPHOR_TIME: + m_shader->set_vector("TimeConstant", 3, options->phosphor_time); break; case CU_PHOSPHOR_BETA: m_shader->set_vector("Beta", 3, options->phosphor_beta); break; - case CU_PHOSPHOR_GAMMA: - m_shader->set_vector("Gamma", 3, options->phosphor_gamma); case CU_LCD_PERSISTENCE: m_shader->set_float("LCDTau", options->lcd_persistence); diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h index 3dda52de423..fd31e2fe679 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.h +++ b/src/osd/modules/render/d3d/d3dhlsl.h @@ -78,9 +78,8 @@ public: CU_FOCUS_SIZE, CU_PHOSPHOR_MODE, - CU_PHOSPHOR_TAU, + CU_PHOSPHOR_TIME, CU_PHOSPHOR_BETA, - CU_PHOSPHOR_GAMMA, CU_LCD_PERSISTENCE, @@ -209,9 +208,8 @@ struct hlsl_options float power[3]; float floor[3]; int phosphor_mode; - float phosphor_tau[3]; + float phosphor_time[3]; float phosphor_beta[3]; - float phosphor_gamma[3]; float lcd_persistence; float saturation; |