Преглед изворни кода

shader: Compute shader fixes

rdb пре 5 година
родитељ
комит
73d1e5bc69
1 измењених фајлова са 17 додато и 17 уклоњено
  1. 17 17
      panda/src/gobj/shader.cxx

+ 17 - 17
panda/src/gobj/shader.cxx

@@ -60,6 +60,22 @@ Shader(ShaderLanguage lang) :
 {
 }
 
+/**
+ * Delete the compiled code, if it exists.
+ */
+Shader::
+~Shader() {
+  release_all();
+  // Note: don't try to erase ourselves from the table.  It currently keeps a
+  // reference forever, and so the only place where this constructor is called
+  // is in the destructor of the table itself.
+  /*if (_loaded) {
+    _load_table.erase(_filename);
+  } else {
+    _make_table.erase(_text);
+  }*/
+}
+
 /**
  * Generate an error message including a description of the specified
  * parameter.  Always returns false.
@@ -2421,22 +2437,6 @@ get_compiler(ShaderLanguage lang) const {
   return registry->get_compiler_from_language(lang);
 }
 
-/**
- * Delete the compiled code, if it exists.
- */
-Shader::
-~Shader() {
-  release_all();
-  // Note: don't try to erase ourselves from the table.  It currently keeps a
-  // reference forever, and so the only place where this constructor is called
-  // is in the destructor of the table itself.
-  /*if (_loaded) {
-    _load_table.erase(_filename);
-  } else {
-    _make_table.erase(_text);
-  }*/
-}
-
 /**
  * Loads the shader with the given filename.
  */
@@ -2567,7 +2567,7 @@ load_compute(ShaderLanguage lang, const Filename &fn) {
   }
 
   PT(Shader) shader = new Shader(lang);
-  if (!shader->do_read_source(Stage::compute, fullpath, record)) {
+  if (!shader->read(sfile)) {
     return nullptr;
   }