[prev in list] [next in list] [prev in thread] [next in thread]
List: cairo
Subject: [cairo] [PATCH 63/71] drm: i915: turn around branch for easier readability
From: "Enrico Weigelt, metux IT consult" <enrico.weigelt () gr13 ! net>
Date: 2017-04-17 16:57:42
Message-ID: 20170417165750.7019-64-enrico.weigelt () gr13 ! net
[Download RAW message or body]
Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt@gr13.net>
---
src/drm/cairo-drm-i915-shader.c | 66 ++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/drm/cairo-drm-i915-shader.c b/src/drm/cairo-drm-i915-shader.c
index 4c6de3ff5..020573921 100644
--- a/src/drm/cairo-drm-i915-shader.c
+++ b/src/drm/cairo-drm-i915-shader.c
@@ -915,39 +915,7 @@ i915_set_shader_program (i915_device_t *device,
if (shader->clip.type.fragment == FS_TEXTURE) {
assert (mask_reg != ~0U);
- if (! shader->need_combine) {
- /* (source IN clip) */
- if (source_reg == ~0U) {
- if (source_pure == 0) {
- source_reg = mask_reg;
- } else {
- out_reg = FS_OC;
- if ((shader->content & CAIRO_CONTENT_COLOR) == 0) {
- if (source_pure & (1 << 3))
- i915_fs_mov (out_reg, i915_fs_operand (mask_reg, W, W, W, W));
- else
- i915_fs_mov (out_reg, i915_fs_operand_zero ());
- } else {
- i915_fs_mov (out_reg,
- i915_fs_operand_impure (mask_reg, W, source_pure));
- }
- source_reg = out_reg;
- }
- } else if (mask_reg) {
- out_reg = FS_OC;
- if ((shader->content & CAIRO_CONTENT_COLOR) == 0) {
- i915_fs_mul (out_reg,
- i915_fs_operand (source_reg, W, W, W, W),
- i915_fs_operand (mask_reg, W, W, W, W));
- } else {
- i915_fs_mul (out_reg,
- i915_fs_operand_reg (source_reg),
- i915_fs_operand (mask_reg, W, W, W, W));
- }
-
- source_reg = out_reg;
- }
- } else {
+ if (shader->need_combine) {
/* (source OP dest) LERP_clip dest */
if (source_reg == ~0U) {
if (source_pure == 0) {
@@ -993,6 +961,38 @@ i915_set_shader_program (i915_device_t *device,
i915_fs_operand_reg (FS_R3),
i915_fs_operand_reg (mask_reg));
}
+ } else {
+ /* (source IN clip) */
+ if (source_reg == ~0U) {
+ if (source_pure == 0) {
+ source_reg = mask_reg;
+ } else {
+ out_reg = FS_OC;
+ if ((shader->content & CAIRO_CONTENT_COLOR) == 0) {
+ if (source_pure & (1 << 3))
+ i915_fs_mov (out_reg, i915_fs_operand (mask_reg, W, W, W, W));
+ else
+ i915_fs_mov (out_reg, i915_fs_operand_zero ());
+ } else {
+ i915_fs_mov (out_reg,
+ i915_fs_operand_impure (mask_reg, W, source_pure));
+ }
+ source_reg = out_reg;
+ }
+ } else if (mask_reg) {
+ out_reg = FS_OC;
+ if ((shader->content & CAIRO_CONTENT_COLOR) == 0) {
+ i915_fs_mul (out_reg,
+ i915_fs_operand (source_reg, W, W, W, W),
+ i915_fs_operand (mask_reg, W, W, W, W));
+ } else {
+ i915_fs_mul (out_reg,
+ i915_fs_operand_reg (source_reg),
+ i915_fs_operand (mask_reg, W, W, W, W));
+ }
+
+ source_reg = out_reg;
+ }
}
}
--
2.11.0.rc0.7.gbe5a750
--
cairo mailing list
cairo@cairographics.org
https://lists.cairographics.org/mailman/listinfo/cairo
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic