diff options
| author | Juan Linietsky | 2014-12-21 11:42:44 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-12-21 11:42:44 -0300 |
| commit | f7f197c40941ffaf03fcddeb20536dec8074ca00 (patch) | |
| tree | 7a69483162bb873813f6152176b815d189af4edd /drivers/gles1 | |
| parent | 9783f6fc969947fdbf666950ab3da21ac462c57e (diff) | |
| download | godot-f7f197c40941ffaf03fcddeb20536dec8074ca00.tar.gz godot-f7f197c40941ffaf03fcddeb20536dec8074ca00.tar.zst godot-f7f197c40941ffaf03fcddeb20536dec8074ca00.zip | |
-ability to set default textures in shader (needed for visual shader editing)
-work in progress new graph system (will replace current one)
-crash fix in s3m loader (out of bounds acess)
-fixed vbox overriding of separation (fixes empty line between section tabs)
Diffstat (limited to 'drivers/gles1')
| -rw-r--r-- | drivers/gles1/rasterizer_gles1.cpp | 10 | ||||
| -rw-r--r-- | drivers/gles1/rasterizer_gles1.h | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/drivers/gles1/rasterizer_gles1.cpp b/drivers/gles1/rasterizer_gles1.cpp index 00fc85c41..902c105d6 100644 --- a/drivers/gles1/rasterizer_gles1.cpp +++ b/drivers/gles1/rasterizer_gles1.cpp @@ -1021,6 +1021,16 @@ void RasterizerGLES1::shader_get_param_list(RID p_shader, List<PropertyInfo> *p_ } + +void RasterizerGLES1::shader_set_default_texture_param(RID p_shader, const StringName& p_name, RID p_texture) { + +} + +RID RasterizerGLES1::shader_get_default_texture_param(RID p_shader, const StringName& p_name) const { + + return RID(); +} + /* COMMON MATERIAL API */ diff --git a/drivers/gles1/rasterizer_gles1.h b/drivers/gles1/rasterizer_gles1.h index 0995089dd..d3e38f3de 100644 --- a/drivers/gles1/rasterizer_gles1.h +++ b/drivers/gles1/rasterizer_gles1.h @@ -875,6 +875,9 @@ public: virtual void shader_get_param_list(RID p_shader, List<PropertyInfo> *p_param_list) const; + virtual void shader_set_default_texture_param(RID p_shader, const StringName& p_name, RID p_texture); + virtual RID shader_get_default_texture_param(RID p_shader, const StringName& p_name) const; + /* COMMON MATERIAL API */ virtual RID material_create(); |
