projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6e5728e) | patch
swrast: Rename blend_func->swrast_blend_func
authorAlyssa Rosenzweig <alyssa@rosenzweig.io>
Fri, 10 May 2019 16:22:05 +0000 (16:22 +0000)
committerCaio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Fri, 10 May 2019 16:34:55 +0000 (09:34 -0700)
commit292187afcc9f32bde54fc1a94d81066e8bed194f
treec1f22595f603bce729a5be6cf36b43cd18f17e12tree
parent6e5728e5c92b6d006862aae24763c3ce32ef20a6commit | diff
swrast: Rename blend_func->swrast_blend_func

This avoids a conflict with the new (driver-agnostic) blend_func enum in
shader_enum.h, which broke the build of swrast (and i965 by extension).

My apologies :(

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Fixes: f41be53a ("compiler: Add enums for blend state")
Cc: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
src/mesa/swrast/s_context.h diff | blob | history