Skip to content

Commit

Permalink
MDL SDK 2021.0.4 (344800.9767)
Browse files Browse the repository at this point in the history
  • Loading branch information
lkettnerNV committed Dec 6, 2021
1 parent 942b04f commit 7565abe
Show file tree
Hide file tree
Showing 11 changed files with 75 additions and 44 deletions.
33 changes: 32 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,39 @@
Change Log
==========
MDL SDK 2021.0.2 (344800.7839): 07 Oct 2021
MDL SDK 2021.0.4 (344800.9767): 26 Nov 2021
-----------------------------------------------

ABI compatible with the MDL SDK 2021.0.4 (344800.9767) binary release
(see [https://developer.nvidia.com/mdl-sdk](https://developer.nvidia.com/mdl-sdk))

**Fixed Bugs**

- General

- Fixed incorrect handling of user-defined type names for structs and enums
when encoded names were enabled.

- MDL Compiler and Backends

- Fixed non-deterministic behavior with `sincos` calls.


MDL SDK 2021.0.3 (344800.8726): 02 Nov 2021
-------------------------------------------

ABI compatible with the MDL SDK 2021.0.3 (344800.8726) binary release
(see [https://developer.nvidia.com/mdl-sdk](https://developer.nvidia.com/mdl-sdk))

**Fixed Bugs**

- MDL Compiler and Backends

- Apply thin film only if thickness > 0.0 (libbsdf).


MDL SDK 2021.0.2 (344800.7839): 07 Oct 2021
-------------------------------------------

ABI compatible with the MDL SDK 2021.0.2 (344800.7839) binary release
(see [https://developer.nvidia.com/mdl-sdk](https://developer.nvidia.com/mdl-sdk))

Expand Down
2 changes: 1 addition & 1 deletion doc/base_module/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ <h3>Edge</h3>

</div><div id="blackfooter">
<span class="footeritem">
7&#160;October&#160;2021,&#160;20:12,&#160;rev.344800.7839
24&#160;November&#160;2021,&#160;20:20,&#160;rev.344800.9767
</span>
<span class="footeritem">
<a href="https://www.nvidia.com/en-us/about-nvidia/legal-info/" target="_blank" shape="rect">&copy; 2021 NVIDIA&nbsp;Corporation.</a> All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion doc/build/doxygen_footer_1_8_4.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- start footer part -->
<!--BEGIN GENERATE_TREEVIEW-->
<div id="nav-path">
<span class="footeritem">MDL SDK 2021.0.2 (344800.7839): $datetime</span>
<span class="footeritem">MDL SDK 2021.0.4 (344800.9767): $datetime</span>
<span class="footeritem">
<a href="http://www.nvidia.com/">
&copy;&#160;2020&#160;NVIDIA&#160;Corporation.</a>
Expand Down
6 changes: 3 additions & 3 deletions doc/core_definitions/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ <h2>Page cannot be loaded</h2>
bottom of the page or from the following links:</p>

<div style="padding-left:2em;">
<a href="mdl_core_definitions.211007.A4.pdf">View documentation in A4 format</a><br>
<a href="mdl_core_definitions.211007.LTR.pdf">View documentation in US Letter format</a><br>
<a href="mdl_core_definitions.211124.A4.pdf">View documentation in A4 format</a><br>
<a href="mdl_core_definitions.211124.LTR.pdf">View documentation in US Letter format</a><br>
</div>
<h3>Overriding security settings</h3>

Expand Down Expand Up @@ -260,7 +260,7 @@ <h3>Edge</h3>
<span class="footeritem">
</span>
<span class="footeritem">
7&#160;October&#160;2021,&#160;20:13,&#160;rev.344800.7839
24&#160;November&#160;2021,&#160;20:21,&#160;rev.344800.9767
</span>
<span class="footeritem">
<a href="https://www.nvidia.com/en-us/about-nvidia/legal-info/" target="_blank" shape="rect">&copy; 2021 NVIDIA&nbsp;Corporation.</a> All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</div>
<div id="blackfooter">
<span class="footeritem">
MDL SDK 2021.0.2 (344800.7839): 07 Oct 2021
MDL SDK 2021.0.4 (344800.9767): 26 Nov 2021
</span>
<span class="footeritem">
<a href="http://www.nvidia.com/">
Expand Down
2 changes: 1 addition & 1 deletion include/mi/neuraylib/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
#endif // MI_NEURAYLIB_VERSION_QUALIFIER_EMPTY

/// \NeurayProductName product version number in a string representation, such as \c "2.0".
#define MI_NEURAYLIB_PRODUCT_VERSION_STRING "2021.0.2"
#define MI_NEURAYLIB_PRODUCT_VERSION_STRING "2021.0.4"

/// Type of plugins for the \NeurayApiName.
/// \see #mi::base::Plugin::get_type().
Expand Down
12 changes: 6 additions & 6 deletions src/base/system/version/version.h
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/* Globally unique version identifier string. */
#define MI_VERSION_STRING "344800.7839"
#define MI_VERSION_STRING "344800.9767"

/* Version identifier for use in Windows resource compiler scripts (4 x 16bits) */
#define MI_VERSION_CSV 34,4800,7839,0
#define MI_VERSION_CSV 34,4800,9767,0
/* Alternate version identifier for compatibility with existing mill builds */
#define MI_VERSION_CSV_BIG 34480,0,7839,0
#define MI_VERSION_CSV_BIG 34480,0,9767,0

/* Numeric version identifier, meaningful only in the context of this branch. */
#define MI_BUILD_NUMBER 7839
#define MI_BUILD_NUMBER 9767

/* Global numeric version identifier */
#define MI_BUILD_NUMBER_FULL 352639
#define MI_BUILD_NUMBER_FULL 354567

#define MI_DATE_STRING "07 Oct 2021"
#define MI_DATE_STRING "26 Nov 2021"
46 changes: 23 additions & 23 deletions src/io/scene/mdl_elements/mdl_elements_utilities.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4736,17 +4736,18 @@ const mi::mdl::IType* int_type_to_mdl_type(
return nullptr;
}

if (mi::mdl::IType_enum const *te = tf.lookup_enum(int_enum_type->get_symbol())) {
// an enum with this name already exists, assume it's the right one
// If an enum with this name already exists, assume it is the right one.
const char* int_type_name = int_enum_type->get_symbol();
std::string core_type_name = decode_name_without_signature( int_type_name);
if( const mi::mdl::IType_enum* te = tf.lookup_enum( core_type_name.c_str()))
return te;
}

const mi::mdl::ISymbol *s = symtab->create_symbol(int_enum_type->get_symbol());
mi::mdl::IType_enum* te = tf.create_enum(s);
for (mi::Size i = 0, n = int_enum_type->get_size(); i < n; ++i) {

const mi::mdl::ISymbol *evs = symtab->create_symbol(int_enum_type->get_value_name(i));
te->add_value(evs, int_enum_type->get_value_code(i));
// Otherwise create it.
const mi::mdl::ISymbol* s = symtab->create_symbol( core_type_name.c_str());
mi::mdl::IType_enum* te = tf.create_enum( s);
for( mi::Size i = 0, n = int_enum_type->get_size(); i < n; ++i) {
const mi::mdl::ISymbol* evs = symtab->create_symbol( int_enum_type->get_value_name( i));
te->add_value( evs, int_enum_type->get_value_code( i));
}
return te;
}
Expand Down Expand Up @@ -4789,22 +4790,21 @@ const mi::mdl::IType* int_type_to_mdl_type(
return nullptr;
}

if (mi::mdl::IType_struct const *st = tf.lookup_struct(int_struct_type->get_symbol())) {
// an struct with this name already exists, assume it's the right one
return st;
}

const mi::mdl::ISymbol *s = symtab->create_symbol(int_struct_type->get_symbol());

mi::mdl::IType_struct* st = tf.create_struct(s);
for (mi::Size i = 0, n = int_struct_type->get_size(); i < n; ++i) {

mi::base::Handle<const IType> field(int_struct_type->get_field_type(i));
const mi::mdl::ISymbol *fs = symtab->create_symbol(int_struct_type->get_field_name(i));
// If a struct with this name already exists, assume it is the right one.
const char* int_type_name = int_struct_type->get_symbol();
std::string core_type_name = decode_name_without_signature( int_type_name);
if( const mi::mdl::IType_struct* ts = tf.lookup_struct( core_type_name.c_str()))
return ts;

st->add_field(int_type_to_mdl_type(field.get(), tf), fs);
// Otherwise create it.
const mi::mdl::ISymbol* s = symtab->create_symbol( core_type_name.c_str());
mi::mdl::IType_struct* ts = tf.create_struct( s);
for( mi::Size i = 0, n = int_struct_type->get_size(); i < n; ++i) {
mi::base::Handle<const IType> field( int_struct_type->get_field_type( i));
const mi::mdl::ISymbol* fs = symtab->create_symbol( int_struct_type->get_field_name( i));
ts->add_field( int_type_to_mdl_type( field.get(), tf), fs);
}
return st;
return ts;
}
case IType::TK_BOOL:
return tf.create_bool();
Expand Down
6 changes: 3 additions & 3 deletions src/mdl/jit/generator_jit/gen_intrinsic_func.py
Original file line number Diff line number Diff line change
Expand Up @@ -6274,9 +6274,9 @@ def finalize(self):
self.add_class_member("mi::mdl::IAllocator *", "m_alloc", "The allocator.", True)
self.add_class_member("LLVM_code_generator &", "m_code_gen", "The code generator.", True)
self.add_class_member("LLVM_code_generator::Target_language", "m_target_lang", "The target language.", True)
self.add_class_member("bool", "m_fast_math", "True if fast-math is enabled.", True)
self.add_class_member("bool", "m_has_sincosf", "True if destination has sincosf.", True)
self.add_class_member("bool", "m_has_res_handler", "True if a resource handler I/F is available.", True)
self.add_class_member("bool const", "m_fast_math", "True if fast-math is enabled.", True)
self.add_class_member("bool const", "m_has_sincosf", "True if destination has sincosf.", True)
self.add_class_member("bool const", "m_has_res_handler", "True if a resource handler I/F is available.", True)
self.add_class_member("bool", "m_use_user_state_module", "True if user-defined state module functions should be used.", False)
self.add_class_member("int", "m_internal_space", "The internal_space encoding.", True)
self.add_class_member("llvm::Function *", "m_runtime_funcs[RT_LAST + 1]", "Runtime functions.", False)
Expand Down
2 changes: 1 addition & 1 deletion src/mdl/jit/generator_jit/generator_jit_llvm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1109,6 +1109,7 @@ LLVM_code_generator::LLVM_code_generator(
, m_use_renderer_adapt_normal(options.get_bool_option(
MDL_JIT_OPTION_USE_RENDERER_ADAPT_NORMAL))
, m_in_intrinsic_generator(false)
, m_target_lang(target_lang)
, m_runtime(create_mdl_runtime(
m_arena_builder,
this,
Expand Down Expand Up @@ -1189,7 +1190,6 @@ LLVM_code_generator::LLVM_code_generator(
, m_sm_version(target_lang == TL_PTX ? sm_version : 0)
, m_min_ptx_version(0)
, m_state_usage_analysis(*this)
, m_target_lang(target_lang)
, m_enable_full_debug(enable_debug)
, m_enable_type_debug(target_lang == TL_HLSL)
, m_exported_funcs_are_entries(false)
Expand Down
6 changes: 3 additions & 3 deletions src/mdl/jit/generator_jit/generator_jit_llvm.h
Original file line number Diff line number Diff line change
Expand Up @@ -3425,6 +3425,9 @@ class LLVM_code_generator
bool m_in_intrinsic_generator;


/// The target language.
Target_language m_target_lang;

/// The runtime creator.
MDL_runtime_creator *m_runtime;

Expand Down Expand Up @@ -3694,9 +3697,6 @@ class LLVM_code_generator
/// Analysis object storing state usage information per function and updating
State_usage_analysis m_state_usage_analysis;

/// The target language.
Target_language m_target_lang;

/// If true, generate full debug info.
bool m_enable_full_debug;

Expand Down

0 comments on commit 7565abe

Please sign in to comment.