AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,323 Commits 1 Branch 0 Tags 17 MiB
1d5eba67f8
Commit Graph

2323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans-Kristian Arntzen
98a17431c2 Merge pull request #214 from dsrbecky/texture-keyword 
Add "texture" to the keyword list.
 2017-06-27 18:35:00 +02:00
Hans-Kristian Arntzen
e095ccae82 Merge pull request #213 from dsrbecky/OpString 
Ignore debug instruction OpString
 2017-06-27 18:34:29 +02:00
David Srbecky
edec5ea137 Add "texture" to the keyword list. 
I have encountered several shaders where people use "texture" as
local variable (old shaders from times when it was not build-in).
 2017-06-27 15:35:47 +01:00
David Srbecky
a08b26926c Ignore debug instruction OpString 
It may be used with OpLine or OpSource to specify filename.
 2017-06-27 15:34:45 +01:00
Hans-Kristian Arntzen
ecf830846f Merge pull request #212 from KhronosGroup/composite-insert-cleanup 
Remove remnants of old OpCompositeInsert hack.
 2017-06-27 08:06:19 +02:00
Hans-Kristian Arntzen
0aac31bda1 Remove remnants of old OpCompositeInsert hack. 2017-06-26 22:58:41 +02:00
Hans-Kristian Arntzen
b0540c28ca Merge pull request #211 from dsrbecky/OpCompositeInsert 
Always make a copy when handling OpCompositeInsert
 2017-06-26 22:53:46 +02:00
David Srbecky
77b5b4446b Always make a copy when handling OpCompositeInsert 
The modified object might not be mutable (e.g. shader input).

Added a test for the case when this happens.
 2017-06-26 18:32:53 +01:00
Hans-Kristian Arntzen
e70ba405c2 Merge pull request #210 from Jasonchan35/master 
added --rename-interface-variable <in|out> <location> <new_variable_name>
 2017-06-26 12:47:56 +02:00
Jason Chan
3281e8278f move the spirv_glsl.cpp specific logic to main.cpp 2017-06-25 15:16:09 +02:00
Jason Chan
02a8bb6975 remove debug message 2017-06-23 23:14:06 +02:00
Jason Chan
f03d377faa fix tab indent 2017-06-23 22:23:26 +02:00
Jason Chan
9f1eb5a20d added --rename-interface-variable <in|out> <location> <new_variable_name> 2017-06-23 22:20:42 +02:00
Hans-Kristian Arntzen
f5fd965fa0 Merge pull request #209 from KhronosGroup/texture-lod-as-grad 
Workaround textureLod on sampler2DArrayShadow
 2017-06-23 10:03:10 +02:00
Hans-Kristian Arntzen
d38b1b086a Fix typo. 2017-06-23 09:50:01 +02:00
Hans-Kristian Arntzen
7bb749142c Run format_all.sh. 2017-06-23 09:46:15 +02:00
Hans-Kristian Arntzen
ad2b7c05e7 Implement workaround for textureLod on 2D array shadow. 
This does not exist in GLSL, but it exists in HLSL if LOD == 0.0.
 2017-06-23 09:45:42 +02:00
Hans-Kristian Arntzen
c6051bbbfa Merge pull request #206 from KhronosGroup/glslang-update 
Update glslang
 2017-06-22 19:52:11 +02:00
Hans-Kristian Arntzen
a1f5453519 Assign block locations to members in MSL. 2017-06-21 09:55:46 +02:00
Hans-Kristian Arntzen
602ed34e34 Update glslang travis commit. 2017-06-21 09:40:12 +02:00
Hans-Kristian Arntzen
de33d89074 Add explicit in/out locations everywhere. 
Needed for newer glslang. With Vulkan semantics for SPIR-V, all
locations must be explicitly defined.
 2017-06-21 09:39:08 +02:00
Hans-Kristian Arntzen
81ad58be86 Merge pull request #203 from KhronosGroup/separate-shadow-sampler-refactor 
Avoid ugly workaround for separate shadow samplers in GLSL/HLSL.
 2017-06-17 11:06:52 +02:00
Hans-Kristian Arntzen
b0f7deedec Run format_all.sh. 2017-06-17 10:56:24 +02:00
Hans-Kristian Arntzen
978901f9e4 Avoid ugly workaround for separate shadow samplers in GLSL/HLSL. 2017-06-17 10:54:59 +02:00
Hans-Kristian Arntzen
a2f6679d13 Merge pull request #202 from KhronosGroup/hlsl-bindings 
Add basic support for : register() declaration in HLSL.
 2017-06-17 10:25:01 +02:00
Hans-Kristian Arntzen
620da7b943 Add basic support for : register() declaration in HLSL. 2017-06-17 10:15:32 +02:00
Hans-Kristian Arntzen
e6baf12efe Merge pull request #201 from KhronosGroup/fallthrough-warning-fix 
Fix fallthrough warning.
 2017-06-17 09:57:13 +02:00
Hans-Kristian Arntzen
3c404c456a Fix fallthrough warning. 2017-06-17 09:38:07 +02:00
Hans-Kristian Arntzen
9db278de42 Merge pull request #200 from h3xl3r/master 
Geometry shader core since GLSL 150
 2017-06-17 09:29:52 +02:00
rob
fb1820e2f5 Geometry shader core since GLSL 150 2017-06-17 10:06:46 +09:00
Hans-Kristian Arntzen
fd9e7ccb93 Merge pull request #198 from brenwill/master 
CompilerMSL add support for MSL specialization function constants.
 2017-06-16 09:18:09 +02:00
Bill Hollings
7c6b07ece1 Merge branch 'master' of https://github.com/KhronosGroup/SPIRV-Cross 2017-06-15 15:26:13 -04:00
Bill Hollings
1f83856366 CompilerMSL add support for MSL specialization function constants. 
CompilerMSL add emit_custom_functions() function.
CompilerMSL restrict use of as_type<> cast to necessary conditions.
CompilerMSL refactor get_declared_struct_member_size() and
get_declared_struct_member_alignment() functions, and remove
unnecessary get_declared_type_size() functions.
Add test shaders-msl/vulkan/frag/spec-constant.vk.frag.
 2017-06-15 15:24:22 -04:00
Hans-Kristian Arntzen
2890da9284 Merge pull request #197 from Jasper-Bekkers/patch-1 
Make image2dBase::load const
 2017-06-13 19:40:46 +02:00
Jasper Bekkers
8ca48135d9 Make image2dBase::load const 
imageLoad takes a const-ref to image and calls load on it, make the load method const to prevent compile error.
 2017-06-13 13:41:11 +02:00
Hans-Kristian Arntzen
3ab1700073 Merge pull request #190 from brenwill/master 
Emit type declarations tuned for specified SPIR-V objects + MSL builtin enhancements.
 2017-06-02 15:34:06 +02:00
Bill Hollings
6f3381a5d3 Fixes from review of PR #190. 2017-06-01 16:29:39 -04:00
Bill Hollings
ba245697f1 Merge branch 'master' of https://github.com/KhronosGroup/SPIRV-Cross 2017-06-01 10:20:00 -04:00
Hans-Kristian Arntzen
03fd7ba068 Merge pull request #194 from Kode/fix 
Fix shader model 2/3 texture sampling
 2017-05-31 18:45:56 +02:00
Robert Konrad
111a30a7d8 Fix shader model 2/3 texture sampling 2017-05-31 16:53:43 +02:00
Hans-Kristian Arntzen
90966d50f5 Merge pull request #192 from KhronosGroup/cmake-install 
Add CMake install support
 2017-05-31 10:37:10 +02:00
Joao Paulo Magalhaes
87df893ba9 Add missing parenthesis from the merge. 2017-05-31 10:20:28 +02:00
Joao Paulo Magalhaes
87e09f47f2 fix core library name 2017-05-31 10:18:27 +02:00
Joao Paulo Magalhaes
3db95327ac Added install targets to cmake. The following tree is produced: 
.
./bin
./bin/spirv-cross.exe
./include
./include/spirv_cross
./include/spirv_cross/GLSL.std.450.h
./include/spirv_cross/spirv.hpp
./include/spirv_cross/spirv_cfg.hpp
./include/spirv_cross/spirv_common.hpp
./include/spirv_cross/spirv_cpp.hpp
./include/spirv_cross/spirv_cross.hpp
./include/spirv_cross/spirv_glsl.hpp
./include/spirv_cross/spirv_msl.hpp
./lib
./lib/spirv-cross-core.lib
./lib/spirv-cross-cpp.lib
./lib/spirv-cross-glsl.lib
./lib/spirv-cross-msl.lib
./share
./share/spirv_cross
./share/spirv_cross/cmake
./share/spirv_cross/cmake/spirv_crossConfig-release.cmake
./share/spirv_cross/cmake/spirv_crossConfig.cmake
./share/spirv_cross_cpp
./share/spirv_cross_cpp/cmake
./share/spirv_cross_cpp/cmake/spirv_cross_cppConfig-release.cmake
./share/spirv_cross_cpp/cmake/spirv_cross_cppConfig.cmake
./share/spirv_cross_glsl
./share/spirv_cross_glsl/cmake
./share/spirv_cross_glsl/cmake/spirv_cross_glslConfig-release.cmake
./share/spirv_cross_glsl/cmake/spirv_cross_glslConfig.cmake
./share/spirv_cross_msl
./share/spirv_cross_msl/cmake
./share/spirv_cross_msl/cmake/spirv_cross_mslConfig-release.cmake
./share/spirv_cross_msl/cmake/spirv_cross_mslConfig.cmake
 2017-05-31 10:18:27 +02:00
Hans-Kristian Arntzen
f77d91e077 Merge pull request #189 from KhronosGroup/flatten-multidimensional-arrays 
Add support for flattening multidimensional arrays into single dimension
 2017-05-31 10:08:03 +02:00
Hans-Kristian Arntzen
326a7ffdf0 Check multidimensional extension in type_to_glsl_constructor. 2017-05-31 10:00:52 +02:00
Hans-Kristian Arntzen
470ae7a7f6 Add multidimensional array flattening test. 2017-05-31 10:00:52 +02:00
Hans-Kristian Arntzen
f0044b91a3 Add support for flattening multidimensional arrays. 2017-05-31 09:59:00 +02:00
Hans-Kristian Arntzen
842eff9647 Merge pull request #188 from KhronosGroup/sso 
Add support for Separate Shader Objects
 2017-05-31 09:55:34 +02:00
Hans-Kristian Arntzen
d93fcbdd9b Merge pull request #191 from hesiod/patch-1 
Fix null pointer dereference
 2017-05-30 21:57:48 +02:00