ShaderGenerator: fix TextureAttrib assertion

rdb · rdb · commit 9c4151cb0f16 · 2017-06-22T13:36:47.000+02:00
This was caused by af57c82 and was triggered by a change in TextureStage sort.
diff --git a/panda/src/pgraph/textureAttrib.I b/panda/src/pgraph/textureAttrib.I
@@ -263,7 +263,7 @@ on_stage_affects_alpha(size_t n) const {
  */
 INLINE void TextureAttrib::
 check_sorted() const {
-  if (_sort_seq != TextureStage::get_sort_seq()) {
+  if (_sort_seq != TextureStage::get_sort_seq() && !_sort_seq.is_fresh()) {
     ((TextureAttrib *)this)->sort_on_stages();
   }
 }
diff --git a/panda/src/pgraph/textureAttrib.cxx b/panda/src/pgraph/textureAttrib.cxx
@@ -807,6 +807,9 @@ get_auto_shader_attrib_impl(const RenderState *state) const {
     }
   }
 
+  // Prevent check_sorted() from being called on this state.
+  attrib->_sort_seq = UpdateSeq::fresh();
+
   return return_new(attrib);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ on_stage_affects_alpha(size_t n) const {`
`263`	`263`	`*/`
`264`	`264`	`INLINE void TextureAttrib::`
`265`	`265`	`check_sorted() const {`
`266`		`- if (_sort_seq != TextureStage::get_sort_seq()) {`
	`266`	`+ if (_sort_seq != TextureStage::get_sort_seq() && !_sort_seq.is_fresh()) {`
`267`	`267`	`((TextureAttrib *)this)->sort_on_stages();`
`268`	`268`	`}`
`269`	`269`	`}`
Original file line number	Diff line number	Diff line change
`@@ -807,6 +807,9 @@ get_auto_shader_attrib_impl(const RenderState *state) const {`
`807`	`807`	`}`
`808`	`808`	`}`
`809`	`809`
	`810`	`+ // Prevent check_sorted() from being called on this state.`
	`811`	`+ attrib->_sort_seq = UpdateSeq::fresh();`
	`812`	`+`
`810`	`813`	`return return_new(attrib);`
`811`	`814`	`}`
`812`	`815`