6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-22 08:16:42 +00:00
Code Issues Projects Releases Wiki Activity

Kills CRTOpenGL.cpp and simplifies shader output very slightly.

Browse Source
This commit is contained in:
Thomas Harte
2018-11-24 17:37:58 -05:00
parent f4764ea680
commit 6b42b92930
4 changed files with 30 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Outputs/OpenGL/ScanTarget.cpp
+1 -3
View File
@@ -13,7 +13,6 @@ using namespace Outputs::Display::OpenGL;
namespace {
/// The texture unit from which to source 1bpp input data.
constexpr GLenum SourceData1BppTextureUnit = GL_TEXTURE0;
/// The texture unit from which to source 2bpp input data.
@@ -175,6 +174,7 @@ void ScanTarget::set_modals(Modals modals) {
// Cascade the texture units in use as per the pipeline stages.
std::vector<Shader *> input_shaders = {input_shader_.get()};
GLint texture_unit = GLint(UnprocessedLineBufferTextureUnit - GL_TEXTURE0);
// output_shader_->set_uniform("textureName", texture_unit);
for(const auto &stage: pipeline_stages_) {
input_shaders.push_back(stage.shader.get());
@@ -186,8 +186,6 @@ void ScanTarget::set_modals(Modals modals) {
}
output_shader_->set_uniform("textureName", texture_unit);
// enable_vertex_attributes(ShaderType::InputScan, *input_shader_);
// Ensure that all shaders involved in the input pipeline have the proper colour space knowledged.
for(auto shader: input_shaders) {
switch(modals.composite_colour_space) {