OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: Modify the #includes in the DXT5 shaders

Browse Source 
1. Drop the commented out includes. Shader caching is disabled if those
   are found.

2. Replace the active includes with "%s". Later on, we'll construct the
   final strings with vasprintf. One downside to doing this is that the
   glsl file extensions are no longer true. These files are now
   templates.

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19827>
This commit is contained in:
Nanley Chery
2022-10-04 22:10:39 -07:00
committed by Marge Bot
parent 96cb3ba424
commit cb296db853
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/glsl/bc1.glsl
View File

@@ -31,9 +31,7 @@
#define const #define const
#endif #endif
// #include "/media/matias/Datos/SyntaxHighlightingMisc.h" %s // include "CrossPlatformSettings_piece_all.glsl"
#include "CrossPlatformSettings_piece_all.glsl"
#define FLT_MAX 340282346638528859811704183484516925440.0f #define FLT_MAX 340282346638528859811704183484516925440.0f

4
src/compiler/glsl/bc4.glsl
View File

@@ -33,9 +33,7 @@
#define __sharedOnlyBarrier memoryBarrierShared();barrier(); #define __sharedOnlyBarrier memoryBarrierShared();barrier();
// #include "/media/matias/Datos/SyntaxHighlightingMisc.h" %s // include "CrossPlatformSettings_piece_all.glsl"
#include "CrossPlatformSettings_piece_all.glsl"
shared float2 g_minMaxValues[4u * 4u * 4u]; shared float2 g_minMaxValues[4u * 4u * 4u];
shared uint2 g_mask[4u * 4u]; shared uint2 g_mask[4u * 4u];

4
src/compiler/glsl/etc2_rgba_stitch.glsl
View File

@@ -27,9 +27,7 @@
#version 310 es #version 310 es
// #include "/media/matias/Datos/SyntaxHighlightingMisc.h" %s // include "CrossPlatformSettings_piece_all.glsl"
#include "CrossPlatformSettings_piece_all.glsl"
layout( local_size_x = 8, // layout( local_size_x = 8, //
local_size_y = 8, // local_size_y = 8, //