maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #24651 from BastiaanOlij/fix_texture_get_data

Browse source 
Fix texture type not being initialised
This commit is contained in:
Rémi Verschelde 2018-12-30 12:33:08 +01:00 committed by GitHub
parent ee6f1fa3f8 9055386de9
commit ede4f9712d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/gles2/rasterizer_storage_gles2.cpp
View file

@ -4104,6 +4104,7 @@ RID RasterizerStorageGLES2::render_target_create() {
Texture *t = memnew(Texture);
t->type = VS::TEXTURE_TYPE_2D;
t->flags = 0;
t->width = 0;
t->height = 0;

1
drivers/gles2/rasterizer_storage_gles2.h
View file

@ -264,6 +264,7 @@ public:
alloc_width(0),
alloc_height(0),
format(Image::FORMAT_L8),
type(VS::TEXTURE_TYPE_2D),
target(0),
data_size(0),
total_data_size(0),

4
drivers/gles3/rasterizer_storage_gles3.cpp
View file

@ -1995,7 +1995,8 @@ void RasterizerStorageGLES3::_update_shader(Shader *p_shader) const {
actions = &shaders.actions_particles;
actions->uniforms = &p_shader->uniforms;
} break;
case VS::SHADER_MAX: break; // Can't happen, but silences warning
case VS::SHADER_MAX:
break; // Can't happen, but silences warning
}
Error err = shaders.compiler.compile(p_shader->mode, p_shader->code, actions, p_shader->path, gen_code);
@ -7019,6 +7020,7 @@ RID RasterizerStorageGLES3::render_target_create() {
Texture *t = memnew(Texture);
t->type = VS::TEXTURE_TYPE_2D;
t->flags = 0;
t->width = 0;
t->height = 0;

1
drivers/gles3/rasterizer_storage_gles3.h
View file

@ -291,6 +291,7 @@ public:
width(0),
height(0),
format(Image::FORMAT_L8),
type(VS::TEXTURE_TYPE_2D),
target(GL_TEXTURE_2D),
data_size(0),
compressed(false),