From 9786a581e0b1b66646ab3def3c49aa3a6360aa36 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Fri, 1 Oct 2021 17:00:56 +0300 Subject: [PATCH] Use friend declaration to access hidden data in Batch --- source/core/batch.h | 4 ++-- source/core/commands.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/core/batch.h b/source/core/batch.h index 41dac24a..e0343555 100644 --- a/source/core/batch.h +++ b/source/core/batch.h @@ -22,6 +22,8 @@ class. */ class Batch: public Bufferable { + friend class Commands; + public: class Loader: public DataFile::ObjectLoader { @@ -44,10 +46,8 @@ public: ~Batch(); PrimitiveType get_type() const { return prim_type; } - unsigned get_gl_primitive_type() const { return gl_prim_type; } void set_index_type(DataType); DataType get_index_type() const { return index_type; } - unsigned get_gl_index_type() const { return gl_index_type; } Batch &append(unsigned); Batch &append(const std::vector &); diff --git a/source/core/commands.cpp b/source/core/commands.cpp index a0a4336a..ebc6394e 100644 --- a/source/core/commands.cpp +++ b/source/core/commands.cpp @@ -72,7 +72,7 @@ void Commands::draw(const Batch &batch) { pipeline_state->apply(); void *data_ptr = reinterpret_cast(batch.get_offset()); - glDrawElements(batch.get_gl_primitive_type(), batch.size(), batch.get_gl_index_type(), data_ptr); + glDrawElements(batch.gl_prim_type, batch.size(), batch.gl_index_type, data_ptr); } void Commands::draw_instanced(const Batch &batch, unsigned count) @@ -81,7 +81,7 @@ void Commands::draw_instanced(const Batch &batch, unsigned count) pipeline_state->apply(); void *data_ptr = reinterpret_cast(batch.get_offset()); - glDrawElementsInstanced(batch.get_gl_primitive_type(), batch.size(), batch.get_gl_index_type(), data_ptr, count); + glDrawElementsInstanced(batch.gl_prim_type, batch.size(), batch.gl_index_type, data_ptr, count); } void Commands::resolve_multisample(Framebuffer &target) -- 2.45.2