Merge pull request #40 from aet/master

bring latest changes from upstream ( 1155504498e0 )

.editorconfig

@@ -0,0 +1,73 @@
+# see http://editorconfig.org/ for docs on this file
+
+root = true
+
+[*]
+# help with sharing files across os's (i.e. network share or through local vm)
+end_of_line = lf
+#charset temporarily disabled due to bug in VS2017 changing to UTF-8 with BOM (https://favro.com/card/c564ede4ed3337f7b17986b6/Uni-17877)
+#charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+# formattable file extensions (keep in sync with format.ini from unity-meta repo)
+#
+# Note: We need to split the formattable files configs into shorter duplicate entries (logically grouped)
+# due to known issue in VS editorconfig extension where there is a limit of 51 characters (empirically determined).
+# see: https://github.com/editorconfig/editorconfig-visualstudio/issues/21
+#
+## uncrustify
+[*.{c,h,cpp,hpp,m,mm,cc,cs}]
+indent_style = space
+indent_size = 4
+
+## generic formatter (shaders)
+[*.{cg,cginc,glslinc,hlsl,shader,y,ypp,yy}]
+indent_style = space
+indent_size = 4
+
+## generic formatter (misc)
+[*.{asm,s,S,pch,pchmm,java,sh,uss}]
+indent_style = space
+indent_size = 4
+
+## perltidy
+[*.{pl,pm,t,it}]
+indent_style = space
+indent_size = 4
+
+## unity special
+[*.{bindings,mem.xml}]
+indent_style = space
+indent_size = 4
+
+# other filetypes we want to overwrite default configuration to preserve the standard
+[{Makefile,makefile}]
+# TAB characters are part of the Makefile format
+indent_style = tab
+
+[*.{md,markdown}]
+# trailing whitespace is significant in markdown (bad choice, bad!)
+trim_trailing_whitespace = false
+
+# keep these and the VS stuff below in sync with .hgeol's CRLF extensions
+[*.{vcproj,bat,cmd,xaml,tt,t4,ttinclude}]
+end_of_line = crlf
+
+# this VS-specific stuff is based on experiments to see how VS will modify a file after it has been manually edited.
+# the settings are meant to closely match what VS does to minimize unnecessary diffs. this duplicates some settings in *
+# but let's be explicit here to be safe (in case someone wants to copy-paste this out to another .editorconfig).
+[*.{vcxproj,vcxproj.filters,csproj,props,targets}]
+indent_style = space
+indent_size = 2
+end_of_line = crlf
+charset = utf-8-bom
+trim_trailing_whitespace = true
+insert_final_newline = false
+[*.{sln,sln.template}]
+indent_style = tab
+indent_size = 4
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false

CMakeLists.txt

@@ -50,9 +50,9 @@ target_include_directories(hlslcc
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/cbstring>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/internal_includes>)
 set_target_properties(hlslcc PROPERTIES
-    CXX_STANDARD 11
-    CXX_STANDARD_REQUIRED ON
-    PUBLIC_HEADERS ${HLSLCC_HDRS})
+    "CXX_STANDARD" "11"
+    "CXX_STANDARD_REQUIRED" "ON"
+    "PUBLIC_HEADERS" "${HLSLCC_HDRS}")
 install(TARGETS hlslcc
     EXPORT hlslccConfig
     ARCHIVE DESTINATION lib

README.md

@@ -5,7 +5,7 @@ Originally based on https://github.com/James-Jones/HLSLCrossCompiler.
 
 This library takes DirectX bytecode as input, and translates it into the following languages:
 - GLSL (OpenGL 3.2 and later)
-- GLSL ES (OpenGL ES 3.0 and later)
+- GLSL ES (OpenGL ES 2.0 and later)
 - GLSL for Vulkan consumption (as input for Glslang to generate SPIR-V)
 - Metal Shading Language
 
@@ -46,6 +46,8 @@ The main entry point is TranslateHLSLFromMem() function in HLSLcc.cpp (taking DX
 - Florian Penzkofer
 - Alexey Orlov
 - Povilas Kanapickas
+- Aleksandr Kirillov
+- Kay Chang
 
 ## License