OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl2: Fix reversed value of step().

Browse Source 
It's 0.0 if x < edge, not 1.0.  Partial fix for glsl-fs-step.
This commit is contained in:
Eric Anholt
2010-06-30 16:22:52 -07:00
parent e64a4aaacb
commit 02d615306e
2 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/glsl/builtin_function.cpp
View File

@@ -2164,15 +2164,15 @@ static const char *builtins_110_step = {
" (parameters\n" " (parameters\n"
" (declare (in) float edge)\n" " (declare (in) float edge)\n"
" (declare (in) float x))\n" " (declare (in) float x))\n"
" ((return (expression float b2f (expression bool < (var_ref x) (var_ref edge))))))\n" " ((return (expression float b2f (expression bool >= (var_ref x) (var_ref edge))))))\n"
"\n" "\n"
" (signature vec2\n" " (signature vec2\n"
" (parameters\n" " (parameters\n"
" (declare (in) float edge)\n" " (declare (in) float edge)\n"
" (declare (in) vec2 x))\n" " (declare (in) vec2 x))\n"
" ((declare () vec2 t)\n" " ((declare () vec2 t)\n"
" (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool < (swiz x (var_ref x))(var_ref edge))))\n" " (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool >= (swiz x (var_ref x))(var_ref edge))))\n"
" (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(var_ref edge))))\n" " (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(var_ref edge))))\n"
" (return (var_ref t))))\n" " (return (var_ref t))))\n"
"\n" "\n"
" (signature vec3\n" " (signature vec3\n"
@@ -2180,9 +2180,9 @@ static const char *builtins_110_step = {
" (declare (in) float edge)\n" " (declare (in) float edge)\n"
" (declare (in) vec3 x))\n" " (declare (in) vec3 x))\n"
" ((declare () vec3 t)\n" " ((declare () vec3 t)\n"
" (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool < (swiz x (var_ref x))(var_ref edge))))\n" " (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool >= (swiz x (var_ref x))(var_ref edge))))\n"
" (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(var_ref edge))))\n" " (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(var_ref edge))))\n"
" (assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool < (swiz z (var_ref x))(var_ref edge))))\n" " (assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool >= (swiz z (var_ref x))(var_ref edge))))\n"
" (return (var_ref t))))\n" " (return (var_ref t))))\n"
"\n" "\n"
" (signature vec4\n" " (signature vec4\n"
@@ -2190,10 +2190,10 @@ static const char *builtins_110_step = {
" (declare (in) float edge)\n" " (declare (in) float edge)\n"
" (declare (in) vec4 x))\n" " (declare (in) vec4 x))\n"
" ((declare () vec4 t)\n" " ((declare () vec4 t)\n"
" (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool < (swiz x (var_ref x))(var_ref edge))))\n" " (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool >= (swiz x (var_ref x))(var_ref edge))))\n"
" (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(var_ref edge))))\n" " (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(var_ref edge))))\n"
" (assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool < (swiz z (var_ref x))(var_ref edge))))\n" " (assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool >= (swiz z (var_ref x))(var_ref edge))))\n"
" (assign (constant bool (1)) (swiz w (var_ref t)) (expression float b2f (expression bool < (swiz w (var_ref x))(var_ref edge))))\n" " (assign (constant bool (1)) (swiz w (var_ref t)) (expression float b2f (expression bool >= (swiz w (var_ref x))(var_ref edge))))\n"
" (return (var_ref t))))\n" " (return (var_ref t))))\n"
"\n" "\n"
" (signature vec2\n" " (signature vec2\n"
@@ -2201,8 +2201,8 @@ static const char *builtins_110_step = {
" (declare (in) vec2 edge)\n" " (declare (in) vec2 edge)\n"
" (declare (in) vec2 x))\n" " (declare (in) vec2 x))\n"
" ((declare () vec2 t)\n" " ((declare () vec2 t)\n"
" (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool < (swiz x (var_ref x))(swiz x (var_ref edge)))))\n" " (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool >= (swiz x (var_ref x))(swiz x (var_ref edge)))))\n"
" (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(swiz y (var_ref edge)))))\n" " (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(swiz y (var_ref edge)))))\n"
" (return (var_ref t))))\n" " (return (var_ref t))))\n"
"\n" "\n"
" (signature vec3\n" " (signature vec3\n"
@@ -2210,9 +2210,9 @@ static const char *builtins_110_step = {
" (declare (in) vec3 edge)\n" " (declare (in) vec3 edge)\n"
" (declare (in) vec3 x))\n" " (declare (in) vec3 x))\n"
" ((declare () vec3 t)\n" " ((declare () vec3 t)\n"
" (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool < (swiz x (var_ref x))(swiz x (var_ref edge)))))\n" " (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool >= (swiz x (var_ref x))(swiz x (var_ref edge)))))\n"
" (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(swiz y (var_ref edge)))))\n" " (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(swiz y (var_ref edge)))))\n"
" (assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool < (swiz z (var_ref x))(swiz z (var_ref edge)))))\n" " (assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool >= (swiz z (var_ref x))(swiz z (var_ref edge)))))\n"
" (return (var_ref t))))\n" " (return (var_ref t))))\n"
"\n" "\n"
" (signature vec4\n" " (signature vec4\n"
@@ -2220,10 +2220,10 @@ static const char *builtins_110_step = {
" (declare (in) vec4 edge)\n" " (declare (in) vec4 edge)\n"
" (declare (in) vec4 x))\n" " (declare (in) vec4 x))\n"
" ((declare () vec4 t)\n" " ((declare () vec4 t)\n"
" (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool < (swiz x (var_ref x))(swiz x (var_ref edge)))))\n" " (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool >= (swiz x (var_ref x))(swiz x (var_ref edge)))))\n"
" (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(swiz y (var_ref edge)))))\n" " (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(swiz y (var_ref edge)))))\n"
" (assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(swiz z (var_ref edge)))))\n" " (assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(swiz z (var_ref edge)))))\n"
" (assign (constant bool (1)) (swiz w (var_ref t)) (expression float b2f (expression bool < (swiz w (var_ref x))(swiz w (var_ref edge)))))\n" " (assign (constant bool (1)) (swiz w (var_ref t)) (expression float b2f (expression bool >= (swiz w (var_ref x))(swiz w (var_ref edge)))))\n"
" (return (var_ref t))))\n" " (return (var_ref t))))\n"
"))\n" "))\n"
"\n" "\n"

38
src/glsl/builtins/110/step
View File

@@ -3,15 +3,15 @@
(parameters (parameters
(declare (in) float edge) (declare (in) float edge)
(declare (in) float x)) (declare (in) float x))
((return (expression float b2f (expression bool < (var_ref x) (var_ref edge)))))) ((return (expression float b2f (expression bool >= (var_ref x) (var_ref edge))))))
(signature vec2 (signature vec2
(parameters (parameters
(declare (in) float edge) (declare (in) float edge)
(declare (in) vec2 x)) (declare (in) vec2 x))
((declare () vec2 t) ((declare () vec2 t)
(assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool < (swiz x (var_ref x))(var_ref edge)))) (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool >= (swiz x (var_ref x))(var_ref edge))))
(assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(var_ref edge)))) (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(var_ref edge))))
(return (var_ref t)))) (return (var_ref t))))
(signature vec3 (signature vec3
@@ -19,9 +19,9 @@
(declare (in) float edge) (declare (in) float edge)
(declare (in) vec3 x)) (declare (in) vec3 x))
((declare () vec3 t) ((declare () vec3 t)
(assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool < (swiz x (var_ref x))(var_ref edge)))) (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool >= (swiz x (var_ref x))(var_ref edge))))
(assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(var_ref edge)))) (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(var_ref edge))))
(assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool < (swiz z (var_ref x))(var_ref edge)))) (assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool >= (swiz z (var_ref x))(var_ref edge))))
(return (var_ref t)))) (return (var_ref t))))
(signature vec4 (signature vec4
@@ -29,10 +29,10 @@
(declare (in) float edge) (declare (in) float edge)
(declare (in) vec4 x)) (declare (in) vec4 x))
((declare () vec4 t) ((declare () vec4 t)
(assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool < (swiz x (var_ref x))(var_ref edge)))) (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool >= (swiz x (var_ref x))(var_ref edge))))
(assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(var_ref edge)))) (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(var_ref edge))))
(assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool < (swiz z (var_ref x))(var_ref edge)))) (assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool >= (swiz z (var_ref x))(var_ref edge))))
(assign (constant bool (1)) (swiz w (var_ref t)) (expression float b2f (expression bool < (swiz w (var_ref x))(var_ref edge)))) (assign (constant bool (1)) (swiz w (var_ref t)) (expression float b2f (expression bool >= (swiz w (var_ref x))(var_ref edge))))
(return (var_ref t)))) (return (var_ref t))))
(signature vec2 (signature vec2
@@ -40,8 +40,8 @@
(declare (in) vec2 edge) (declare (in) vec2 edge)
(declare (in) vec2 x)) (declare (in) vec2 x))
((declare () vec2 t) ((declare () vec2 t)
(assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool < (swiz x (var_ref x))(swiz x (var_ref edge))))) (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool >= (swiz x (var_ref x))(swiz x (var_ref edge)))))
(assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(swiz y (var_ref edge))))) (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(swiz y (var_ref edge)))))
(return (var_ref t)))) (return (var_ref t))))
(signature vec3 (signature vec3
@@ -49,9 +49,9 @@
(declare (in) vec3 edge) (declare (in) vec3 edge)
(declare (in) vec3 x)) (declare (in) vec3 x))
((declare () vec3 t) ((declare () vec3 t)
(assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool < (swiz x (var_ref x))(swiz x (var_ref edge))))) (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool >= (swiz x (var_ref x))(swiz x (var_ref edge)))))
(assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(swiz y (var_ref edge))))) (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(swiz y (var_ref edge)))))
(assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool < (swiz z (var_ref x))(swiz z (var_ref edge))))) (assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool >= (swiz z (var_ref x))(swiz z (var_ref edge)))))
(return (var_ref t)))) (return (var_ref t))))
(signature vec4 (signature vec4
@@ -59,10 +59,10 @@
(declare (in) vec4 edge) (declare (in) vec4 edge)
(declare (in) vec4 x)) (declare (in) vec4 x))
((declare () vec4 t) ((declare () vec4 t)
(assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool < (swiz x (var_ref x))(swiz x (var_ref edge))))) (assign (constant bool (1)) (swiz x (var_ref t)) (expression float b2f (expression bool >= (swiz x (var_ref x))(swiz x (var_ref edge)))))
(assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(swiz y (var_ref edge))))) (assign (constant bool (1)) (swiz y (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(swiz y (var_ref edge)))))
(assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool < (swiz y (var_ref x))(swiz z (var_ref edge))))) (assign (constant bool (1)) (swiz z (var_ref t)) (expression float b2f (expression bool >= (swiz y (var_ref x))(swiz z (var_ref edge)))))
(assign (constant bool (1)) (swiz w (var_ref t)) (expression float b2f (expression bool < (swiz w (var_ref x))(swiz w (var_ref edge))))) (assign (constant bool (1)) (swiz w (var_ref t)) (expression float b2f (expression bool >= (swiz w (var_ref x))(swiz w (var_ref edge)))))
(return (var_ref t)))) (return (var_ref t))))
)) ))