From 718cdc66dd273fc1ccad765d378cdbccc8da1f65 Mon Sep 17 00:00:00 2001 From: Mark Janes Date: Thu, 2 Nov 2017 13:53:19 -0700 Subject: State: Enable glClearColor --- retrace/daemon/glframe_state_enums.cpp | 1 + retrace/daemon/glframe_state_override.cpp | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/retrace/daemon/glframe_state_enums.cpp b/retrace/daemon/glframe_state_enums.cpp index 32d50706..ec0316d7 100644 --- a/retrace/daemon/glframe_state_enums.cpp +++ b/retrace/daemon/glframe_state_enums.cpp @@ -48,6 +48,7 @@ glretrace::state_name_to_enum(const std::string &value) { {"GL_BLEND_SRC", GL_BLEND_SRC}, {"GL_BLEND_SRC_ALPHA", GL_BLEND_SRC_ALPHA}, {"GL_BLEND_SRC_RGB", GL_BLEND_SRC_RGB}, + {"GL_COLOR_CLEAR_VALUE", GL_COLOR_CLEAR_VALUE}, {"GL_CONSTANT_ALPHA", GL_CONSTANT_ALPHA}, {"GL_CONSTANT_COLOR", GL_CONSTANT_COLOR}, {"GL_CULL_FACE", GL_CULL_FACE}, diff --git a/retrace/daemon/glframe_state_override.cpp b/retrace/daemon/glframe_state_override.cpp index 0af7f4d6..814ece38 100644 --- a/retrace/daemon/glframe_state_override.cpp +++ b/retrace/daemon/glframe_state_override.cpp @@ -93,6 +93,7 @@ StateOverride::getState(const StateKey &item, break; } case GL_BLEND_COLOR: + case GL_COLOR_CLEAR_VALUE: case GL_LINE_WIDTH: { get_float_state(n, data); break; @@ -218,6 +219,17 @@ StateOverride::enact_state(const KeyMap &m) const { assert(GL::GetError() == GL_NO_ERROR); break; } + case GL_COLOR_CLEAR_VALUE: { + std::vector f(4); + IntFloat u; + for (int j = 0; j < 4; ++j) { + u.i = i.second[j]; + f[j] = u.f; + } + GlFunctions::ClearColor(f[0], f[1], f[2], f[3]); + assert(GL::GetError() == GL_NO_ERROR); + break; + } case GL_LINE_WIDTH: { // assert(i.second.size() == 1); IntFloat u; @@ -343,4 +355,11 @@ StateOverride::onState(SelectionId selId, callback->onState(selId, experimentCount, renderId, k, {state_enum_to_name(data[0])}); } + { + StateKey k("Rendering", "Clear State", "GL_COLOR_CLEAR_VALUE"); + getState(k, &data); + std::vector color; + floatStrings(data, &color); + callback->onState(selId, experimentCount, renderId, k, color); + } } -- cgit v1.2.3