소스 검색

Merge pull request #38979 from lawnjelly/kessel_unshaded_bug

GLES2 Batching - Builtins prevent baking in unshaded shaders
Rémi Verschelde 5 년 전
부모
커밋
7ccb146a55
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      drivers/gles2/rasterizer_canvas_gles2.cpp

+ 1 - 1
drivers/gles2/rasterizer_canvas_gles2.cpp

@@ -2285,7 +2285,7 @@ bool RasterizerCanvasGLES2::try_join_item(Item *p_ci, RenderItemState &r_ris, bo
 
 	// does the shader contain BUILTINs which should break the batching?
 	bdata.joined_item_batch_flags = 0;
-	if (r_ris.shader_cache && !unshaded) {
+	if (r_ris.shader_cache) {
 
 		unsigned int and_flags = r_ris.shader_cache->canvas_item.batch_flags & (RasterizerStorageGLES2::Shader::CanvasItem::PREVENT_COLOR_BAKING | RasterizerStorageGLES2::Shader::CanvasItem::PREVENT_VERTEX_BAKING);
 		if (and_flags) {