From 6e56b42faa242f3d8b935a07cbb9b5300cebf0a6 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Mon, 7 Jun 2021 15:11:50 -0300 Subject: 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. --- source/blender/blenfont/intern/blf_glyph.c | 2 +- source/blender/gpu/shaders/gpu_shader_text_frag.glsl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender') 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)); -- cgit v1.2.3