Skip to content

clean up development history

Erik Faye-Lund requested to merge msclc-d3d12-rebased-v5 into msclc-d3d12

Here's another round of development history cleanups.

This is the diff to the tip of the tree:

diff --git a/src/gallium/drivers/d3d12/d3d12_context.cpp b/src/gallium/drivers/d3d12/d3d12_context.cpp
index fad3a0d7f92..e8cdecb94fa 100644
--- a/src/gallium/drivers/d3d12/d3d12_context.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_context.cpp
@@ -335,7 +335,6 @@ d3d12_create_blend_state(struct pipe_context *pctx,
          state->blend_factor_flags |= need_blend_factor_alpha((pipe_blendfactor) rt->alpha_src_factor);
          state->blend_factor_flags |= need_blend_factor_alpha((pipe_blendfactor) rt->alpha_dst_factor);

-
          if (state->blend_factor_flags == (D3D12_BLEND_FACTOR_COLOR | D3D12_BLEND_FACTOR_ALPHA) &&
              (d3d12_debug & D3D12_DEBUG_VERBOSE)) {
             /* We can't set a blend factor for both constant color and constant alpha */
Edited by Erik Faye-Lund

Merge request reports