Skip to content

Commit 9f014d4

Browse files
author
Felix Igelbrink
committed
fixed errors preventing compilation
1 parent b57b7b2 commit 9f014d4

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

optix/build.pyx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ ELSE:
7474
TRIANGLE = OPTIX_PRIMITIVE_TYPE_TRIANGLE
7575

7676

77-
class InstanceFlags(IntFlag):
78-
"""
79-
Wraps the OptixInstanceFlags enum.
80-
"""
81-
NONE = OPTIX_INSTANCE_FLAG_NONE,
82-
DISABLE_TRIANGLE_FACE_CULLING = OPTIX_INSTANCE_FLAG_DISABLE_TRIANGLE_FACE_CULLING,
83-
FLIP_TRIANGLE_FACING = OPTIX_INSTANCE_FLAG_FLIP_TRIANGLE_FACING,
84-
DISABLE_ANYHIT = OPTIX_INSTANCE_FLAG_DISABLE_ANYHIT,
85-
ENFORCE_ANYHIT = OPTIX_INSTANCE_FLAG_ENFORCE_ANYHIT,
77+
class InstanceFlags(IntFlag):
78+
"""
79+
Wraps the OptixInstanceFlags enum.
80+
"""
81+
NONE = OPTIX_INSTANCE_FLAG_NONE,
82+
DISABLE_TRIANGLE_FACE_CULLING = OPTIX_INSTANCE_FLAG_DISABLE_TRIANGLE_FACE_CULLING,
83+
FLIP_TRIANGLE_FACING = OPTIX_INSTANCE_FLAG_FLIP_TRIANGLE_FACING,
84+
DISABLE_ANYHIT = OPTIX_INSTANCE_FLAG_DISABLE_ANYHIT,
85+
ENFORCE_ANYHIT = OPTIX_INSTANCE_FLAG_ENFORCE_ANYHIT,
8686

8787

8888
cdef class BuildInputArray(OptixObject):

optix/module.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ ELSE:
110110
cdef class ModuleCompileOptions(OptixObject):
111111
cdef OptixModuleCompileOptions compile_options
112112

113-
cdef class BuiltinISOptions:
113+
cdef class BuiltinISOptions(OptixObject):
114114
cdef OptixBuiltinISOptions options
115115

116116
cdef class Module(OptixContextObject):

optix/module.pyx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,18 +176,18 @@ cdef class Module(OptixContextObject):
176176
program_name=None):
177177
super().__init__(context)
178178
self._compile_flags = list(compile_flags)
179-
179+
cdef const char * c_ptx
180+
cdef unsigned int pipeline_payload_values, i
180181
if src is not None:
181182
if not _is_ptx(src):
182183
ptx = self._compile_cuda_ptx(src, name=program_name)
183184
else:
184185
ptx = src
185-
cdef const char* c_ptx = ptx
186+
c_ptx = ptx
186187

187188
IF _OPTIX_VERSION > 70300:
188189
# check if the payload values match between the module and pipeline compile options
189-
cdef unsigned int pipeline_payload_values = <unsigned int>pipeline_compile_options.compile_options.numPayloadValues
190-
cdef unsigned int i
190+
pipeline_payload_values = <unsigned int>pipeline_compile_options.compile_options.numPayloadValues
191191
if module_compile_options.payload_types.size() > 0:
192192
for i in range(module_compile_options.compile_options.numPayloadTypes):
193193
if pipeline_payload_values != module_compile_options.compile_options.payloadTypes[i].numPayloadValues:
@@ -212,7 +212,7 @@ cdef class Module(OptixContextObject):
212212
ModuleCompileOptions module_compile_options,
213213
PipelineCompileOptions pipeline_compile_options,
214214
BuiltinISOptions builtin_is_options):
215-
module = cls(context, None)
215+
cdef Module module = cls(context, None)
216216
optix_check_return(optixBuiltinISModuleGet(context.c_context,
217217
&module_compile_options.compile_options,
218218
&pipeline_compile_options.compile_options,

0 commit comments

Comments
 (0)