Просмотр исходного кода

broadcom/vc5: Rename V3D 3.x Flat Shade Action to match v4.x naming.

Now that the actions are reused for centroid and nonperspective, give them
a more generic name.
tags/18.0-branchpoint
Eric Anholt 7 лет назад
Родитель
Сommit
aa77a9cf5a
2 измененных файлов: 8 добавлений и 8 удалений
  1. 3
    3
      src/broadcom/cle/v3d_packet_v33.xml
  2. 5
    5
      src/gallium/drivers/vc5/vc5_emit.c

+ 3
- 3
src/broadcom/cle/v3d_packet_v33.xml Просмотреть файл

@@ -92,7 +92,7 @@
<value name="ANISOTROPIC_16_1" value="15"/>
</enum>

<enum name="Flat Shade Action" prefix="V3D_FLAT_SHADE_ACTION">
<enum name="Varying Flags Action" prefix="V3D_VARYING_FLAGS_ACTION">
<value name="unchanged" value="0"/>
<value name="zeroed" value="1"/>
<value name="set" value="2"/>
@@ -456,8 +456,8 @@

<packet code="98" name="Flat Shade Flags">
<field name="Flat Shade Flags for varyings V0*24" size="24" start="8" type="uint"/>
<field name="Action for Flat Shade Flags of higher numbered varyings" size="2" start="6" type="Flat Shade Action"/>
<field name="Action for Flat Shade Flags of lower numbered varyings" size="2" start="4" type="Flat Shade Action"/>
<field name="Action for Flat Shade Flags of higher numbered varyings" size="2" start="6" type="Varying Flags Action"/>
<field name="Action for Flat Shade Flags of lower numbered varyings" size="2" start="4" type="Varying Flags Action"/>
<field name="Varying offset V0" size="4" start="0" type="uint"/>
</packet>


+ 5
- 5
src/gallium/drivers/vc5/vc5_emit.c Просмотреть файл

@@ -520,17 +520,17 @@ vc5_emit_state(struct pipe_context *pctx)

if (emitted_any) {
flags.action_for_flat_shade_flags_of_lower_numbered_varyings =
V3D_FLAT_SHADE_ACTION_UNCHANGED;
V3D_VARYING_FLAGS_ACTION_UNCHANGED;
flags.action_for_flat_shade_flags_of_higher_numbered_varyings =
V3D_FLAT_SHADE_ACTION_UNCHANGED;
V3D_VARYING_FLAGS_ACTION_UNCHANGED;
} else {
flags.action_for_flat_shade_flags_of_lower_numbered_varyings =
((i == 0) ?
V3D_FLAT_SHADE_ACTION_UNCHANGED :
V3D_FLAT_SHADE_ACTION_ZEROED);
V3D_VARYING_FLAGS_ACTION_UNCHANGED :
V3D_VARYING_FLAGS_ACTION_ZEROED);

flags.action_for_flat_shade_flags_of_higher_numbered_varyings =
V3D_FLAT_SHADE_ACTION_ZEROED;
V3D_VARYING_FLAGS_ACTION_ZEROED;
}

flags.flat_shade_flags_for_varyings_v024 =

Загрузка…
Отмена
Сохранить