From 79f0ebd9606956e2988d9485b9d4c701e975c7f1 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Wed, 15 Nov 2017 20:46:16 +0100 Subject: [PATCH] Use double right angle brackets for nested templates everywhere, now that we have C++11. --- effect.h | 26 +++++++++++++------------- effect_chain.cpp | 10 +++++----- effect_chain.h | 18 +++++++++--------- resource_pool.cpp | 4 ++-- resource_pool.h | 6 +++--- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/effect.h b/effect.h index 073780f..afac5dc 100644 --- a/effect.h +++ b/effect.h @@ -403,19 +403,19 @@ private: std::map params_vec4; // Picked out by EffectChain during finalization. - std::vector > uniforms_image2d; - std::vector > uniforms_sampler2d; - std::vector > uniforms_bool; - std::vector > uniforms_int; - std::vector > uniforms_float; - std::vector > uniforms_vec2; - std::vector > uniforms_vec3; - std::vector > uniforms_vec4; - std::vector > uniforms_float_array; - std::vector > uniforms_vec2_array; - std::vector > uniforms_vec3_array; - std::vector > uniforms_vec4_array; - std::vector > uniforms_mat3; + std::vector> uniforms_image2d; + std::vector> uniforms_sampler2d; + std::vector> uniforms_bool; + std::vector> uniforms_int; + std::vector> uniforms_float; + std::vector> uniforms_vec2; + std::vector> uniforms_vec3; + std::vector> uniforms_vec4; + std::vector> uniforms_float_array; + std::vector> uniforms_vec2_array; + std::vector> uniforms_vec3_array; + std::vector> uniforms_vec4_array; + std::vector> uniforms_mat3; friend class EffectChain; }; diff --git a/effect_chain.cpp b/effect_chain.cpp index 0c46768..ecf4208 100644 --- a/effect_chain.cpp +++ b/effect_chain.cpp @@ -311,10 +311,10 @@ string replace_prefix(const string &text, const string &prefix) namespace { template -void extract_uniform_declarations(const vector > &effect_uniforms, +void extract_uniform_declarations(const vector> &effect_uniforms, const string &type_specifier, const string &effect_id, - vector > *phase_uniforms, + vector> *phase_uniforms, string *glsl_string) { for (unsigned i = 0; i < effect_uniforms.size(); ++i) { @@ -327,10 +327,10 @@ void extract_uniform_declarations(const vector > &effect_uniforms, } template -void extract_uniform_array_declarations(const vector > &effect_uniforms, +void extract_uniform_array_declarations(const vector> &effect_uniforms, const string &type_specifier, const string &effect_id, - vector > *phase_uniforms, + vector> *phase_uniforms, string *glsl_string) { for (unsigned i = 0; i < effect_uniforms.size(); ++i) { @@ -347,7 +347,7 @@ void extract_uniform_array_declarations(const vector > &effect_unifor } template -void collect_uniform_locations(GLuint glsl_program_num, vector > *phase_uniforms) +void collect_uniform_locations(GLuint glsl_program_num, vector> *phase_uniforms) { for (unsigned i = 0; i < phase_uniforms->size(); ++i) { Uniform &uniform = (*phase_uniforms)[i]; diff --git a/effect_chain.h b/effect_chain.h index 54cf0e5..dc5e3c4 100644 --- a/effect_chain.h +++ b/effect_chain.h @@ -195,15 +195,15 @@ struct Phase { std::map effect_ids; // Uniforms for this phase; combined from all the effects. - std::vector > uniforms_image2d; - std::vector > uniforms_sampler2d; - std::vector > uniforms_bool; - std::vector > uniforms_int; - std::vector > uniforms_float; - std::vector > uniforms_vec2; - std::vector > uniforms_vec3; - std::vector > uniforms_vec4; - std::vector > uniforms_mat3; + std::vector> uniforms_image2d; + std::vector> uniforms_sampler2d; + std::vector> uniforms_bool; + std::vector> uniforms_int; + std::vector> uniforms_float; + std::vector> uniforms_vec2; + std::vector> uniforms_vec3; + std::vector> uniforms_vec4; + std::vector> uniforms_mat3; // For measurement of GPU time used. std::list timer_query_objects_running; diff --git a/resource_pool.cpp b/resource_pool.cpp index 10ab788..e6f9bb6 100644 --- a/resource_pool.cpp +++ b/resource_pool.cpp @@ -57,7 +57,7 @@ ResourcePool::~ResourcePool() void *context = get_gl_context_identifier(); cleanup_unlinked_fbos(context); - for (map >::iterator context_it = fbo_freelist.begin(); + for (map>::iterator context_it = fbo_freelist.begin(); context_it != fbo_freelist.end(); ++context_it) { if (context_it->first != context) { @@ -92,7 +92,7 @@ void ResourcePool::delete_program(GLuint glsl_program_num) } assert(found_program); - map >::iterator instance_list_it = program_instances.find(glsl_program_num); + map>::iterator instance_list_it = program_instances.find(glsl_program_num); assert(instance_list_it != program_instances.end()); while (!instance_list_it->second.empty()) { diff --git a/resource_pool.h b/resource_pool.h index 2324abc..85a5e52 100644 --- a/resource_pool.h +++ b/resource_pool.h @@ -197,7 +197,7 @@ private: // By default, will only contain the program itself, but due to cloning // (see use_glsl_program()), may grow. Programs are taken off this list // while they are in use (by use_glsl_program()). - std::map > program_instances; + std::map> program_instances; // For each program, the master program that created it // (inverse of program_instances). @@ -245,7 +245,7 @@ private: // the last element will be deleted. // // We store iterators directly into for efficiency. - std::map > fbo_freelist; + std::map> fbo_freelist; // Very similar, for VAOs. struct VAO { @@ -255,7 +255,7 @@ private: }; std::map, VAO> vao_formats; typedef std::map, VAO>::iterator VAOFormatIterator; - std::map > vao_freelist; + std::map> vao_freelist; // See the caveats at the constructor. static size_t estimate_texture_size(const Texture2D &texture_format); -- 2.39.2