summaryrefslogtreecommitdiffstats
path: root/servers/rendering/rendering_device.h
diff options
context:
space:
mode:
authorAaron Franke <arnfranke@yahoo.com>2020-10-16 21:19:21 -0400
committerAaron Franke <arnfranke@yahoo.com>2020-12-04 19:34:50 -0500
commit19bdd01438d243ab352311d2673e7ed006250f5a (patch)
tree877d9b83174b339b5adbbda801f0f2cdc2254819 /servers/rendering/rendering_device.h
parent40b81339d098d04003ea474aa7690e42bd858091 (diff)
downloadredot-engine-19bdd01438d243ab352311d2673e7ed006250f5a.tar.gz
Rename RD uniform "type" to "uniform_type"
"type" isn't very descriptive for exposed code, and this variable is exposed via RD_SETGET.
Diffstat (limited to 'servers/rendering/rendering_device.h')
-rw-r--r--servers/rendering/rendering_device.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/rendering_device.h b/servers/rendering/rendering_device.h
index f1f8b3cda0..06790712d0 100644
--- a/servers/rendering/rendering_device.h
+++ b/servers/rendering/rendering_device.h
@@ -629,7 +629,7 @@ public:
virtual RID texture_buffer_create(uint32_t p_size_elements, DataFormat p_format, const Vector<uint8_t> &p_data = Vector<uint8_t>()) = 0;
struct Uniform {
- UniformType type;
+ UniformType uniform_type;
int binding; //binding index as specified in shader
//for single items, provide one ID, for
@@ -640,7 +640,7 @@ public:
Vector<RID> ids;
Uniform() {
- type = UNIFORM_TYPE_IMAGE;
+ uniform_type = UNIFORM_TYPE_IMAGE;
binding = 0;
}
};