diff --git a/shaders/glsl/compileshaders.py b/shaders/glsl/compileshaders.py
index c53acfa1..d9a4c1ef 100644
--- a/shaders/glsl/compileshaders.py
+++ b/shaders/glsl/compileshaders.py
@@ -30,12 +30,14 @@ def findGlslang():
 
     sys.exit("Could not find glslangvalidator executable on PATH, and was not specified with --glslang")
 
+file_extensions = tuple([".vert", ".frag", ".comp", ".geom", ".tesc", ".tese", ".rgen", ".rchit", ".rmiss", ".mesh", ".task"])
+
 glslang_path = findGlslang()
 dir_path = os.path.dirname(os.path.realpath(__file__))
 dir_path = dir_path.replace('\\', '/')
 for root, dirs, files in os.walk(dir_path):
     for file in files:
-        if file.endswith(".vert") or file.endswith(".frag") or file.endswith(".comp") or file.endswith(".geom") or file.endswith(".tesc") or file.endswith(".tese") or file.endswith(".rgen") or file.endswith(".rchit") or file.endswith(".rmiss"):
+        if file.endswith(file_extensions):
             input_file = os.path.join(root, file)
             output_file = input_file + ".spv"
 
@@ -50,6 +52,9 @@ for root, dirs, files in os.walk(dir_path):
             # Same goes for samples that use ray queries
             if root.endswith("rayquery") and file.endswith(".frag"):
                 add_params = add_params + " --target-env vulkan1.2"
+            # Mesh and task shader also require different settings
+            if file.endswith(".mesh") or file.endswith(".task"):
+                add_params = add_params + " --target-env spirv1.4"
 
             res = subprocess.call("%s -V %s -o %s %s" % (glslang_path, input_file, output_file, add_params), shell=True)
             if res != 0:
diff --git a/shaders/hlsl/compileshaders.py b/shaders/hlsl/compileshaders.py
index 24033bf2..0e093f26 100644
--- a/shaders/hlsl/compileshaders.py
+++ b/shaders/hlsl/compileshaders.py
@@ -29,12 +29,14 @@ def findDXC():
 
     sys.exit("Could not find DXC executable on PATH, and was not specified with --dxc")
 
+file_extensions = tuple([".vert", ".frag", ".comp", ".geom", ".tesc", ".tese", ".rgen", ".rchit", ".rmiss", ".mesh", ".task"])
+
 dxc_path = findDXC()
 dir_path = os.path.dirname(os.path.realpath(__file__))
 dir_path = dir_path.replace('\\', '/')
 for root, dirs, files in os.walk(dir_path):
     for file in files:
-        if file.endswith(".vert") or file.endswith(".frag") or file.endswith(".comp") or file.endswith(".geom") or file.endswith(".tesc") or file.endswith(".tese") or file.endswith(".rgen") or file.endswith(".rchit") or file.endswith(".rmiss") or file.endswith(".mesh") :
+        if file.endswith(file_extensions):
             hlsl_file = os.path.join(root, file)
             spv_out = hlsl_file + ".spv"
 
@@ -62,6 +64,10 @@ for root, dirs, files in os.walk(dir_path):
                 target='-fspv-target-env=vulkan1.2'
                 additional_exts = '-fspv-extension=SPV_EXT_mesh_shader'
                 profile = 'ms_6_6'                
+            elif(hlsl_file.find('.task') != -1):
+                target='-fspv-target-env=vulkan1.2'
+                additional_exts = '-fspv-extension=SPV_EXT_mesh_shader'
+                profile = 'as_6_6'                  
 
             if root.endswith("debugprintf"):
                 additional_exts = '-fspv-extension=SPV_KHR_non_semantic_info'