[Bf-blender-cvs] [706c7d775d2] blender-v2.93-release: Fix T77651: Black screen on Blender startup on ChromeOS
Germano Cavalcante
noreply at git.blender.org
Wed Jun 9 08:54:46 CEST 2021
Commit: 706c7d775d263e962161d2f280722d23be0081d6
Author: Germano Cavalcante
Date: Mon Jun 7 15:11:50 2021 -0300
Branches: blender-v2.93-release
https://developer.blender.org/rB706c7d775d263e962161d2f280722d23be0081d6
Fix T77651: Black screen on Blender startup on ChromeOS
Apparently `textureSize` doesn't work with
`sampler1DArray` on this OS.
Thanks to @dave1853 for finding the source of the
problem.
===================================================================
M source/blender/blenfont/intern/blf_glyph.c
M source/blender/gpu/shaders/gpu_shader_text_frag.glsl
===================================================================
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
index f3c5c057dec..2ec0ca22865 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -506,7 +506,7 @@ void blf_glyph_render(FontBLF *font, GlyphCacheBLF *gc, GlyphBLF *g, float x, fl
if (gc->texture) {
GPU_texture_free(gc->texture);
}
- gc->texture = GPU_texture_create_1d_array(__func__, w, h, 1, GPU_R8, NULL);
+ gc->texture = GPU_texture_create_2d(__func__, w, h, 1, GPU_R8, NULL);
gc->bitmap_len_landed = 0;
}
diff --git a/source/blender/gpu/shaders/gpu_shader_text_frag.glsl b/source/blender/gpu/shaders/gpu_shader_text_frag.glsl
index d85884e0a25..2568cd74445 100644
--- a/source/blender/gpu/shaders/gpu_shader_text_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_text_frag.glsl
@@ -7,7 +7,7 @@ flat in int interp_size;
out vec4 fragColor;
-uniform sampler1DArray glyph;
+uniform sampler2D glyph;
const vec2 offsets4[4] = vec2[4](
vec2(-0.5, 0.5), vec2(0.5, 0.5), vec2(-0.5, -0.5), vec2(-0.5, -0.5));
More information about the Bf-blender-cvs
mailing list