Merge remote-tracking branch 'origin/12.0-development' into remove-au…

…totools

CMakeLists.txt

@@ -1413,6 +1413,7 @@ set(LOVE_SRC_3P_GLSLANG_GLSLANG_MACHINEINDEPENDENT
 	src/libraries/glslang/glslang/MachineIndependent/Scan.h
 	src/libraries/glslang/glslang/MachineIndependent/ScanContext.h
 	src/libraries/glslang/glslang/MachineIndependent/ShaderLang.cpp
+	src/libraries/glslang/glslang/MachineIndependent/span.h
 	src/libraries/glslang/glslang/MachineIndependent/SpirvIntrinsics.cpp
 	src/libraries/glslang/glslang/MachineIndependent/SymbolTable.cpp
 	src/libraries/glslang/glslang/MachineIndependent/SymbolTable.h
@@ -1427,7 +1428,6 @@ set(LOVE_SRC_3P_GLSLANG_GLSLANG_OSDEPENDENT
 if(MSVC OR MINGW)
 	set(LOVE_SRC_3P_GLSLANG_GLSLANG_OSDEPENDENT
 		${LOVE_SRC_3P_GLSLANG_GLSLANG_OSDEPENDENT}
-		src/libraries/glslang/glslang/OSDependent/Windows/main.cpp
 		src/libraries/glslang/glslang/OSDependent/Windows/ossource.cpp
 	)
 else()
@@ -1438,21 +1438,22 @@ else()
 endif()
 
 set(LOVE_SRC_3P_GLSLANG_GLSLANG_PUBLIC
+	src/libraries/glslang/glslang/Public/ResourceLimits.h
 	src/libraries/glslang/glslang/Public/ShaderLang.h
 )
 
+set(LOVE_SRC_3P_GLSLANG_GLSLANG_RESOURCELIMITS
+	src/libraries/glslang/glslang/ResourceLimits/ResourceLimits.cpp
+)
+
 set(LOVE_SRC_3P_GLSLANG_GLSLANG
 	src/libraries/glslang/glslang/build_info.h
 	${LOVE_SRC_3P_GLSLANG_GLSLANG_GENERICCODEGEN}
 	${LOVE_SRC_3P_GLSLANG_GLSLANG_INCLUDE}
 	${LOVE_SRC_3P_GLSLANG_GLSLANG_MACHINEINDEPENDENT}
 	${LOVE_SRC_3P_GLSLANG_GLSLANG_OSDEPENDENT}
 	${LOVE_SRC_3P_GLSLANG_GLSLANG_PUBLIC}
-)
-
-set(LOVE_SRC_3P_GLSLANG_OGLCOMPILERSDLL
-	src/libraries/glslang/OGLCompilersDLL/InitializeDll.cpp
-	src/libraries/glslang/OGLCompilersDLL/InitializeDll.h
+	${LOVE_SRC_3P_GLSLANG_GLSLANG_RESOURCELIMITS}
 )
 
 set(LOVE_SRC_3P_GLSLANG_SPIRV
@@ -1462,9 +1463,11 @@ set(LOVE_SRC_3P_GLSLANG_SPIRV
 	src/libraries/glslang/SPIRV/doc.cpp
 	src/libraries/glslang/SPIRV/doc.h
 	src/libraries/glslang/SPIRV/GLSL.ext.AMD.h
+	src/libraries/glslang/SPIRV/GLSL.ext.ARM.h
 	src/libraries/glslang/SPIRV/GLSL.ext.EXT.h
 	src/libraries/glslang/SPIRV/GLSL.ext.KHR.h
 	src/libraries/glslang/SPIRV/GLSL.ext.NV.h
+	src/libraries/glslang/SPIRV/GLSL.ext.QCOM.h
 	src/libraries/glslang/SPIRV/GLSL.std.450.h
 	src/libraries/glslang/SPIRV/GlslangToSpv.cpp
 	src/libraries/glslang/SPIRV/GlslangToSpv.h
@@ -1473,6 +1476,7 @@ set(LOVE_SRC_3P_GLSLANG_SPIRV
 	src/libraries/glslang/SPIRV/Logger.cpp
 	src/libraries/glslang/SPIRV/Logger.h
 	src/libraries/glslang/SPIRV/NonSemanticDebugPrintf.h
+	src/libraries/glslang/SPIRV/NonSemanticShaderDebugInfo100.h
 	src/libraries/glslang/SPIRV/spirv.hpp
 	src/libraries/glslang/SPIRV/SpvBuilder.cpp
 	src/libraries/glslang/SPIRV/SpvBuilder.h
@@ -1486,7 +1490,6 @@ set(LOVE_SRC_3P_GLSLANG_SPIRV
 
 set(LOVE_SRC_3P_GLSLANG
 	${LOVE_SRC_3P_GLSLANG_GLSLANG}
-	${LOVE_SRC_3P_GLSLANG_OGLCOMPILERSDLL}
 	${LOVE_SRC_3P_GLSLANG_SPIRV}
 )
 
@@ -1772,8 +1775,6 @@ set(LOVE_SRC_3P_SPIRV_CROSS
 	src/libraries/spirv_cross/spirv_common.hpp
 	src/libraries/spirv_cross/spirv_cpp.cpp
 	src/libraries/spirv_cross/spirv_cpp.hpp
-	src/libraries/spirv_cross/spirv_cross_c.cpp
-	src/libraries/spirv_cross/spirv_cross_c.h
 	src/libraries/spirv_cross/spirv_cross_containers.hpp
 	src/libraries/spirv_cross/spirv_cross_error_handling.hpp
 	src/libraries/spirv_cross/spirv_cross_parsed_ir.cpp
@@ -1792,7 +1793,6 @@ set(LOVE_SRC_3P_SPIRV_CROSS
 	src/libraries/spirv_cross/spirv_parser.hpp
 	src/libraries/spirv_cross/spirv_reflect.cpp
 	src/libraries/spirv_cross/spirv_reflect.hpp
-	src/libraries/spirv_cross/spirv.h
 	src/libraries/spirv_cross/spirv.hpp
 )
 

changes.txt

@@ -68,7 +68,8 @@ Released: N/A
 * Added APIs to override the default orthographic projection: love.graphics.setOrthoProjection, setPerspectiveProjection, and resetProjection.
 * Added ability to set point size within a vertex shader by setting the 'love_PointSize' variable.
 * Added love.graphics.setBlendState, which gives lower level control over blend operations than setBlendMode.
-* Added love.graphics.setStencilMode and getStencilMode. Replaces love.graphics.stencil as well as setStencilTest.
+* Added high level love.graphics.setStencilMode and getStencilMode functions. Replaces love.graphics.stencil and setStencilTest.
+* Added lower level love.graphics.setStencilState and getStencilState functions.
 * Added a variant of love.graphics.setColorMask which accepts a single boolean.
 * Added new 'clampone' wrap mode.
 * Added 'clampone', 'texelbuffer', 'indexbuffer32bit', 'mipmaprange', and 'indirectdraw' graphics feature enums.
@@ -113,8 +114,8 @@ Released: N/A
 * Deprecated love.graphics.setNewFont (use love.graphics.newFont and love.graphics.setFont instead).
 * Deprecated love.graphics.newText (renamed to love.graphics.newTextBatch).
 * Deprecated love.graphics.getImageFormats and love.graphics.getCanvasFormats (replaced by getTextureFormats).
-* Deprecated love.graphics.stencil (replaced by love.graphics.setStencilMode).
-* Deprecated love.graphics.setStencilTest and love.graphics.getStencilTest (replaced by love.graphics.setStencilMode and getStencilMode).
+* Deprecated love.graphics.stencil (replaced by love.graphics.setStencilMode or love.graphics.setStencilState).
+* Deprecated love.graphics.setStencilTest and love.graphics.getStencilTest (replaced by love.graphics.setStencilMode or setStencilState).
 * Deprecated t.window.highdpi in love.conf and the highdpi flag of love.window.setMode (replaced by t.highdpi in love.conf).
 * Deprecated t.accelerometerjoystick in love.conf (replaced by love.sensor module).
 * Deprecated the variants of Mesh:attachAttribute and SpriteBatch:attachAttribute which accept a Mesh (replaced by variants which accept a Buffer).