Skip to content

Commit 0570a0a

Browse files
SpasiSpasi
committed
feat(spvc) update to 0.51.0
1 parent d9cff07 commit 0570a0a

File tree

7 files changed

+479
-12
lines changed

7 files changed

+479
-12
lines changed

Diff for: ‎doc/notes/3.3.2.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ This build includes the following changes:
4444
- OpenVR: Updated to 1.23.7 (up from 1.16.8)
4545
- OpenXR: Updated to 1.0.26 (up from 1.0.22)
4646
- Remotery: Updated to 1.2.1 (up from 1.0.0)
47-
- Shaderc: Updated to 2022.3 (up from 2022.1)
48-
- SPIRV-Cross: Updated to 0.49.0 (up from 0.48.0)
47+
- Shaderc: Updated to 2023.2 (up from 2022.1)
48+
- SPIRV-Cross: Updated to 0.51.0 (up from 0.48.0)
4949
- stb
5050
* Updated `stb_image` to 2.28 (up from 2.27)
5151
- tinyfiledialogs: Updated to 3.9.0 (up from 3.8.8)

Diff for: ‎modules/lwjgl/spvc/src/generated/java/org/lwjgl/util/spvc/Spvc.java

+80-4
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ private Functions() {}
5454
msl_vertex_attribute_init = apiGetFunctionAddress(SPVC, "spvc_msl_vertex_attribute_init"),
5555
msl_shader_interface_var_init = apiGetFunctionAddress(SPVC, "spvc_msl_shader_interface_var_init"),
5656
msl_shader_input_init = apiGetFunctionAddress(SPVC, "spvc_msl_shader_input_init"),
57+
msl_shader_interface_var_init_2 = apiGetFunctionAddress(SPVC, "spvc_msl_shader_interface_var_init_2"),
5758
msl_resource_binding_init = apiGetFunctionAddress(SPVC, "spvc_msl_resource_binding_init"),
5859
msl_get_aux_buffer_struct_version = apiGetFunctionAddress(SPVC, "spvc_msl_get_aux_buffer_struct_version"),
5960
msl_constexpr_sampler_init = apiGetFunctionAddress(SPVC, "spvc_msl_constexpr_sampler_init"),
@@ -93,7 +94,9 @@ private Functions() {}
9394
compiler_msl_add_vertex_attribute = apiGetFunctionAddress(SPVC, "spvc_compiler_msl_add_vertex_attribute"),
9495
compiler_msl_add_resource_binding = apiGetFunctionAddress(SPVC, "spvc_compiler_msl_add_resource_binding"),
9596
compiler_msl_add_shader_input = apiGetFunctionAddress(SPVC, "spvc_compiler_msl_add_shader_input"),
97+
compiler_msl_add_shader_input_2 = apiGetFunctionAddress(SPVC, "spvc_compiler_msl_add_shader_input_2"),
9698
compiler_msl_add_shader_output = apiGetFunctionAddress(SPVC, "spvc_compiler_msl_add_shader_output"),
99+
compiler_msl_add_shader_output_2 = apiGetFunctionAddress(SPVC, "spvc_compiler_msl_add_shader_output_2"),
97100
compiler_msl_add_discrete_descriptor_set = apiGetFunctionAddress(SPVC, "spvc_compiler_msl_add_discrete_descriptor_set"),
98101
compiler_msl_set_argument_buffer_device_address_space = apiGetFunctionAddress(SPVC, "spvc_compiler_msl_set_argument_buffer_device_address_space"),
99102
compiler_msl_is_vertex_attribute_used = apiGetFunctionAddress(SPVC, "spvc_compiler_msl_is_vertex_attribute_used"),
@@ -207,7 +210,7 @@ public static SharedLibrary getLibrary() {
207210

208211
public static final int SPVC_C_API_VERSION_MAJOR = 0;
209212

210-
public static final int SPVC_C_API_VERSION_MINOR = 49;
213+
public static final int SPVC_C_API_VERSION_MINOR = 51;
211214

212215
public static final int SPVC_C_API_VERSION_PATCH = 0;
213216

@@ -328,6 +331,7 @@ public static SharedLibrary getLibrary() {
328331
* <li>{@link #SPVC_RESOURCE_TYPE_SEPARATE_SAMPLERS RESOURCE_TYPE_SEPARATE_SAMPLERS}</li>
329332
* <li>{@link #SPVC_RESOURCE_TYPE_ACCELERATION_STRUCTURE RESOURCE_TYPE_ACCELERATION_STRUCTURE}</li>
330333
* <li>{@link #SPVC_RESOURCE_TYPE_RAY_QUERY RESOURCE_TYPE_RAY_QUERY}</li>
334+
* <li>{@link #SPVC_RESOURCE_TYPE_SHADER_RECORD_BUFFER RESOURCE_TYPE_SHADER_RECORD_BUFFER}</li>
331335
* </ul>
332336
*/
333337
public static final int
@@ -344,7 +348,8 @@ public static SharedLibrary getLibrary() {
344348
SPVC_RESOURCE_TYPE_SEPARATE_IMAGE = 10,
345349
SPVC_RESOURCE_TYPE_SEPARATE_SAMPLERS = 11,
346350
SPVC_RESOURCE_TYPE_ACCELERATION_STRUCTURE = 12,
347-
SPVC_RESOURCE_TYPE_RAY_QUERY = 13;
351+
SPVC_RESOURCE_TYPE_RAY_QUERY = 13,
352+
SPVC_RESOURCE_TYPE_SHADER_RECORD_BUFFER = 14;
348353

349354
/**
350355
* {@code spvc_builtin_resource_type}
@@ -508,6 +513,22 @@ public static SharedLibrary getLibrary() {
508513
SPVC_MSL_SHADER_INPUT_FORMAT_ANY16 = SPVC_MSL_SHADER_VARIABLE_FORMAT_ANY16,
509514
SPVC_MSL_SHADER_INPUT_FORMAT_ANY32 = SPVC_MSL_SHADER_VARIABLE_FORMAT_ANY32;
510515

516+
/**
517+
* {@code spvc_msl_shader_variable_rate}
518+
*
519+
* <h5>Enum values:</h5>
520+
*
521+
* <ul>
522+
* <li>{@link #SPVC_MSL_SHADER_VARIABLE_RATE_PER_VERTEX MSL_SHADER_VARIABLE_RATE_PER_VERTEX}</li>
523+
* <li>{@link #SPVC_MSL_SHADER_VARIABLE_RATE_PER_PRIMITIVE MSL_SHADER_VARIABLE_RATE_PER_PRIMITIVE}</li>
524+
* <li>{@link #SPVC_MSL_SHADER_VARIABLE_RATE_PER_PATCH MSL_SHADER_VARIABLE_RATE_PER_PATCH}</li>
525+
* </ul>
526+
*/
527+
public static final int
528+
SPVC_MSL_SHADER_VARIABLE_RATE_PER_VERTEX = 0,
529+
SPVC_MSL_SHADER_VARIABLE_RATE_PER_PRIMITIVE = 1,
530+
SPVC_MSL_SHADER_VARIABLE_RATE_PER_PATCH = 2;
531+
511532
/**
512533
* Maps to C++ API.
513534
*
@@ -854,6 +875,8 @@ public static SharedLibrary getLibrary() {
854875
* <li>{@link #SPVC_COMPILER_OPTION_MSL_IOS_SUPPORT_BASE_VERTEX_INSTANCE COMPILER_OPTION_MSL_IOS_SUPPORT_BASE_VERTEX_INSTANCE}</li>
855876
* <li>{@link #SPVC_COMPILER_OPTION_GLSL_OVR_MULTIVIEW_VIEW_COUNT COMPILER_OPTION_GLSL_OVR_MULTIVIEW_VIEW_COUNT}</li>
856877
* <li>{@link #SPVC_COMPILER_OPTION_RELAX_NAN_CHECKS COMPILER_OPTION_RELAX_NAN_CHECKS}</li>
878+
* <li>{@link #SPVC_COMPILER_OPTION_MSL_RAW_BUFFER_TESE_INPUT COMPILER_OPTION_MSL_RAW_BUFFER_TESE_INPUT}</li>
879+
* <li>{@link #SPVC_COMPILER_OPTION_MSL_SHADER_PATCH_INPUT_BUFFER_INDEX COMPILER_OPTION_MSL_SHADER_PATCH_INPUT_BUFFER_INDEX}</li>
857880
* </ul>
858881
*/
859882
public static final int
@@ -937,7 +960,9 @@ public static SharedLibrary getLibrary() {
937960
SPVC_COMPILER_OPTION_MSL_FORCE_SAMPLE_RATE_SHADING = 75 | SPVC_COMPILER_OPTION_MSL_BIT,
938961
SPVC_COMPILER_OPTION_MSL_IOS_SUPPORT_BASE_VERTEX_INSTANCE = 76 | SPVC_COMPILER_OPTION_MSL_BIT,
939962
SPVC_COMPILER_OPTION_GLSL_OVR_MULTIVIEW_VIEW_COUNT = 77 | SPVC_COMPILER_OPTION_GLSL_BIT,
940-
SPVC_COMPILER_OPTION_RELAX_NAN_CHECKS = 78 | SPVC_COMPILER_OPTION_COMMON_BIT;
963+
SPVC_COMPILER_OPTION_RELAX_NAN_CHECKS = 78 | SPVC_COMPILER_OPTION_COMMON_BIT,
964+
SPVC_COMPILER_OPTION_MSL_RAW_BUFFER_TESE_INPUT = 79 | SPVC_COMPILER_OPTION_MSL_BIT,
965+
SPVC_COMPILER_OPTION_MSL_SHADER_PATCH_INPUT_BUFFER_INDEX = 80 | SPVC_COMPILER_OPTION_MSL_BIT;
941966

942967
protected Spvc() {
943968
throw new UnsupportedOperationException();
@@ -998,7 +1023,11 @@ public static void nspvc_msl_shader_interface_var_init(long var) {
9981023
invokePV(var, __functionAddress);
9991024
}
10001025

1001-
/** Initializes the shader input struct. */
1026+
/**
1027+
* Initializes the shader input struct.
1028+
*
1029+
* <p>Deprecated. Use {@link #spvc_msl_shader_interface_var_init_2 msl_shader_interface_var_init_2}.</p>
1030+
*/
10021031
public static void spvc_msl_shader_interface_var_init(@NativeType("spvc_msl_shader_interface_var *") SpvcMslShaderInterfaceVar var) {
10031032
nspvc_msl_shader_interface_var_init(var.address());
10041033
}
@@ -1016,6 +1045,19 @@ public static void spvc_msl_shader_input_init(@NativeType("spvc_msl_shader_input
10161045
nspvc_msl_shader_input_init(input.address());
10171046
}
10181047

1048+
// --- [ spvc_msl_shader_interface_var_init_2 ] ---
1049+
1050+
/** Unsafe version of: {@link #spvc_msl_shader_interface_var_init_2 msl_shader_interface_var_init_2} */
1051+
public static void nspvc_msl_shader_interface_var_init_2(long var) {
1052+
long __functionAddress = Functions.msl_shader_interface_var_init_2;
1053+
invokePV(var, __functionAddress);
1054+
}
1055+
1056+
/** Initializes the shader interface variable struct. */
1057+
public static void spvc_msl_shader_interface_var_init_2(@NativeType("spvc_msl_shader_interface_var_2 *") SpvcMslShaderInterfaceVar2 var) {
1058+
nspvc_msl_shader_interface_var_init_2(var.address());
1059+
}
1060+
10191061
// --- [ spvc_msl_resource_binding_init ] ---
10201062

10211063
/** Unsafe version of: {@link #spvc_msl_resource_binding_init msl_resource_binding_init} */
@@ -1587,6 +1629,7 @@ public static int spvc_compiler_msl_add_resource_binding(@NativeType("spvc_compi
15871629

15881630
// --- [ spvc_compiler_msl_add_shader_input ] ---
15891631

1632+
/** Unsafe version of: {@link #spvc_compiler_msl_add_shader_input compiler_msl_add_shader_input} */
15901633
public static int nspvc_compiler_msl_add_shader_input(long compiler, long input) {
15911634
long __functionAddress = Functions.compiler_msl_add_shader_input;
15921635
if (CHECKS) {
@@ -1595,13 +1638,30 @@ public static int nspvc_compiler_msl_add_shader_input(long compiler, long input)
15951638
return invokePPI(compiler, input, __functionAddress);
15961639
}
15971640

1641+
/** Deprecated; use {@link #spvc_compiler_msl_add_shader_input_2 compiler_msl_add_shader_input_2}. */
15981642
@NativeType("spvc_result")
15991643
public static int spvc_compiler_msl_add_shader_input(@NativeType("spvc_compiler") long compiler, @NativeType("spvc_msl_shader_interface_var const *") SpvcMslShaderInterfaceVar input) {
16001644
return nspvc_compiler_msl_add_shader_input(compiler, input.address());
16011645
}
16021646

1647+
// --- [ spvc_compiler_msl_add_shader_input_2 ] ---
1648+
1649+
public static int nspvc_compiler_msl_add_shader_input_2(long compiler, long input) {
1650+
long __functionAddress = Functions.compiler_msl_add_shader_input_2;
1651+
if (CHECKS) {
1652+
check(compiler);
1653+
}
1654+
return invokePPI(compiler, input, __functionAddress);
1655+
}
1656+
1657+
@NativeType("spvc_result")
1658+
public static int spvc_compiler_msl_add_shader_input_2(@NativeType("spvc_compiler") long compiler, @NativeType("spvc_msl_shader_interface_var_2 const *") SpvcMslShaderInterfaceVar2 input) {
1659+
return nspvc_compiler_msl_add_shader_input_2(compiler, input.address());
1660+
}
1661+
16031662
// --- [ spvc_compiler_msl_add_shader_output ] ---
16041663

1664+
/** Unsafe version of: {@link #spvc_compiler_msl_add_shader_output compiler_msl_add_shader_output} */
16051665
public static int nspvc_compiler_msl_add_shader_output(long compiler, long output) {
16061666
long __functionAddress = Functions.compiler_msl_add_shader_output;
16071667
if (CHECKS) {
@@ -1610,11 +1670,27 @@ public static int nspvc_compiler_msl_add_shader_output(long compiler, long outpu
16101670
return invokePPI(compiler, output, __functionAddress);
16111671
}
16121672

1673+
/** Deprecated; use {@link #spvc_compiler_msl_add_shader_output_2 compiler_msl_add_shader_output_2}. */
16131674
@NativeType("spvc_result")
16141675
public static int spvc_compiler_msl_add_shader_output(@NativeType("spvc_compiler") long compiler, @NativeType("spvc_msl_shader_interface_var const *") SpvcMslShaderInterfaceVar output) {
16151676
return nspvc_compiler_msl_add_shader_output(compiler, output.address());
16161677
}
16171678

1679+
// --- [ spvc_compiler_msl_add_shader_output_2 ] ---
1680+
1681+
public static int nspvc_compiler_msl_add_shader_output_2(long compiler, long output) {
1682+
long __functionAddress = Functions.compiler_msl_add_shader_output_2;
1683+
if (CHECKS) {
1684+
check(compiler);
1685+
}
1686+
return invokePPI(compiler, output, __functionAddress);
1687+
}
1688+
1689+
@NativeType("spvc_result")
1690+
public static int spvc_compiler_msl_add_shader_output_2(@NativeType("spvc_compiler") long compiler, @NativeType("spvc_msl_shader_interface_var_2 const *") SpvcMslShaderInterfaceVar2 output) {
1691+
return nspvc_compiler_msl_add_shader_output_2(compiler, output.address());
1692+
}
1693+
16181694
// --- [ spvc_compiler_msl_add_discrete_descriptor_set ] ---
16191695

16201696
@NativeType("spvc_result")

Diff for: ‎modules/lwjgl/spvc/src/generated/java/org/lwjgl/util/spvc/SpvcMslShaderInput.java

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
* <p>After compilation, it is possible to query whether or not this location was used. If {@code vecsize} is nonzero, it must be greater than or equal to
2222
* the {@code vecsize} declared in the shader, or behavior is undefined.</p>
2323
*
24+
* <p>Deprecated; use {@code spvc_msl_shader_interface_var_2}.</p>
25+
*
2426
* <h3>Layout</h3>
2527
*
2628
* <pre><code>

Diff for: ‎modules/lwjgl/spvc/src/generated/java/org/lwjgl/util/spvc/SpvcMslShaderInterfaceVar.java

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
* <p>After compilation, it is possible to query whether or not this location was used. If {@code vecsize} is nonzero, it must be greater than or equal to
2222
* the {@code vecsize} declared in the shader, or behavior is undefined.</p>
2323
*
24+
* <p>Deprecated; use {@code spvc_msl_shader_interface_var_2}.</p>
25+
*
2426
* <h3>Layout</h3>
2527
*
2628
* <pre><code>

0 commit comments

Comments
 (0)