fix textures on LLVM14

Author: Hugobros3

src/frontends/llvm/l2s_type.c

@@ -49,18 +49,6 @@ const Type* convert_type(Parser* p, LLVMTypeRef t) {
             Node* decl = NULL;
             const Node* result = NULL;
             if (name) {
-                if (strcmp(name, "struct.__shady_builtin_sampler2D") == 0)
-                    return sampled_image_type(a, (SampledImageType) { .image_type = image_type(a, (ImageType) {
-                        //.sampled_type = pack_type(a, (PackType) { .element_type = float_type(a, (Float) { .width = FloatTy32 }), .width = 4 }),
-                        .sampled_type = float_type(a, (Float) { .width = FloatTy32 }),
-                        .dim = 1,
-                        .depth = 0,
-                        .arrayed = 0,
-                        .ms = 0,
-                        .sampled = 1,
-                        .imageformat = 0
-                    } ) });
-
                 decl = nominal_type(p->dst, empty(a), name);
                 result = type_decl_ref_helper(a, decl);
                 insert_dict(LLVMTypeRef, const Type*, p->map, t, result);
@@ -89,7 +77,21 @@ const Type* convert_type(Parser* p, LLVMTypeRef t) {
             return arr_type(a, (ArrType) { .element_type = elem_t, .size = uint32_literal(a, length)});
         }
         case LLVMPointerTypeKind: {
-            AddressSpace as = convert_llvm_address_space(LLVMGetPointerAddressSpace(t));
+            unsigned int llvm_as = LLVMGetPointerAddressSpace(t);
+            switch (llvm_as) {
+                case 0x1000: return sampled_image_type(a, (SampledImageType) { .image_type = image_type(a, (ImageType) {
+                            //.sampled_type = pack_type(a, (PackType) { .element_type = float_type(a, (Float) { .width = FloatTy32 }), .width = 4 }),
+                            .sampled_type = float_type(a, (Float) { .width = FloatTy32 }),
+                            .dim = 1,
+                            .depth = 0,
+                            .arrayed = 0,
+                            .ms = 0,
+                            .sampled = 1,
+                            .imageformat = 0
+                    } ) });
+                default: break;
+            }
+            AddressSpace as = convert_llvm_address_space(llvm_as);
             const Type* pointee = NULL;
 #if !UNTYPED_POINTERS
             LLVMTypeRef element_type = LLVMGetElementType(t);

src/frontends/llvm/l2s_value.c

@@ -130,6 +130,7 @@ const Node* convert_value(Parser* p, LLVMValueRef v) {
             return get_default_zero_value(a, convert_type(p, LLVMTypeOf(v)));
         case LLVMConstantArrayValueKind: {
             assert(t->tag == ArrType_TAG);
+            assert(LLVMIsConstant(v));
             if (LLVMIsConstantString(v)) {
                 size_t idc;
                 r = string_lit_helper(a, LLVMGetAsString(v, &idc));

src/shady/internal/scheduler.slim

@@ -19,7 +19,7 @@
 @Internal var logical subgroup TreeNode active_branch;
 
 @Internal @Builtin("SubgroupLocalInvocationId")
-var logical input u32 subgroup_local_id;
+var input u32 subgroup_local_id;
 
 @Internal @Leaf
 fn builtin_init_scheduler() {

test/vcc/textured.frag.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <shady.h>
 
-descriptor_set(0) descriptor_binding(1) uniform sampler2D texSampler;
+descriptor_set(0) descriptor_binding(1) uniform_constant sampler2D texSampler;
 
 location(0) input vec3 fragColor;
 location(1) input vec2 fragTexCoord;

vcc-std/include/shady.h

@@ -21,18 +21,16 @@ namespace vcc {
 #define input                  __attribute__((address_space(389)))
 #define output                 __attribute__((address_space(390)))
 // maybe deprecate it ?
-#define uniform                __attribute__((annotate("shady::uniform")))
 #define uniform_constant       __attribute__((address_space(398)))
 #define uniform_block          __attribute__((address_space(395)))
 #define push_constant          __attribute__((address_space(392)))
 #define global                 __attribute__((address_space(1)))
 #define shared                 __attribute__((address_space(3)))
 #define private                __attribute__((address_space(5)))
-#define private_logical        __attribute__((address_space(385)))
 
 #include "shady_vec.h"
 
-typedef struct __shady_builtin_sampler2D {} sampler2D;
+typedef __attribute__((address_space(0x1000))) struct __shady_builtin_sampler2D* sampler2D;
 
 vec4 texture2D(const sampler2D, native_vec2) __asm__("shady::prim_op::sample_texture");