Browse Source

Merge pull request #66858 from clayjohn/GLES3-pix-size

Properly expose TEXTURE_PIXEL_SIZE in Opengl3 renderer
Rémi Verschelde 2 years ago
parent
commit
11d49dcc0a
2 changed files with 5 additions and 1 deletions
  1. 4 0
      drivers/gles3/shaders/canvas.glsl
  2. 1 1
      drivers/gles3/storage/material_storage.cpp

+ 4 - 0
drivers/gles3/shaders/canvas.glsl

@@ -127,6 +127,8 @@ void main() {
 	}
 	}
 #endif
 #endif
 
 
+	vec2 color_texture_pixel_size = draw_data[draw_data_instance].color_texture_pixel_size.xy;
+
 #ifdef USE_POINT_SIZE
 #ifdef USE_POINT_SIZE
 	float point_size = 1.0;
 	float point_size = 1.0;
 #endif
 #endif
@@ -393,6 +395,8 @@ void main() {
 	vec2 screen_uv = vec2(0.0);
 	vec2 screen_uv = vec2(0.0);
 #endif
 #endif
 
 
+	vec2 color_texture_pixel_size = draw_data[draw_data_instance].color_texture_pixel_size.xy;
+
 	vec3 light_vertex = vec3(vertex, 0.0);
 	vec3 light_vertex = vec3(vertex, 0.0);
 	vec2 shadow_vertex = vertex;
 	vec2 shadow_vertex = vertex;
 
 

+ 1 - 1
drivers/gles3/storage/material_storage.cpp

@@ -1393,7 +1393,7 @@ MaterialStorage::MaterialStorage() {
 		actions.renames["NORMAL_MAP"] = "normal_map";
 		actions.renames["NORMAL_MAP"] = "normal_map";
 		actions.renames["NORMAL_MAP_DEPTH"] = "normal_map_depth";
 		actions.renames["NORMAL_MAP_DEPTH"] = "normal_map_depth";
 		actions.renames["TEXTURE"] = "color_texture";
 		actions.renames["TEXTURE"] = "color_texture";
-		actions.renames["TEXTURE_PIXEL_SIZE"] = "draw_data.color_texture_pixel_size";
+		actions.renames["TEXTURE_PIXEL_SIZE"] = "color_texture_pixel_size";
 		actions.renames["NORMAL_TEXTURE"] = "normal_texture";
 		actions.renames["NORMAL_TEXTURE"] = "normal_texture";
 		actions.renames["SPECULAR_SHININESS_TEXTURE"] = "specular_texture";
 		actions.renames["SPECULAR_SHININESS_TEXTURE"] = "specular_texture";
 		actions.renames["SPECULAR_SHININESS"] = "specular_shininess";
 		actions.renames["SPECULAR_SHININESS"] = "specular_shininess";