GPUShader: Rename createInfo storage Qualifiers

Using opt-in instead of opt-out to make code easier to read.
Add combined flag enum.
Making restrict an inverse flag option because it is so rare to
use it.

1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc
index 815c488cf8b..3a212eb165c 100644
--- a/source/blender/gpu/opengl/gl_shader.cc
+++ b/source/blender/gpu/opengl/gl_shader.cc
@@ -277,15 +277,15 @@ static void print_image_type(std::ostream &os,
 
 static std::ostream &print_qualifier(std::ostream &os, const Qualifier &qualifiers)
 {
-  if ((qualifiers & Qualifier::RESTRICT) == Qualifier::RESTRICT) {
+  if (bool(qualifiers & Qualifier::NO_RESTRICT) == false) {
     os << "restrict ";
   }
-  if ((qualifiers & Qualifier::READ_ONLY) == Qualifier::READ_ONLY) {
-    os << "readonly ";
-  }
-  if ((qualifiers & Qualifier::WRITE_ONLY) == Qualifier::WRITE_ONLY) {
+  if (bool(qualifiers & Qualifier::READ) == false) {
     os << "writeonly ";
   }
+  if (bool(qualifiers & Qualifier::WRITE) == false) {
+    os << "readonly ";
+  }
   return os;
 }