reivilibre/iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Merge pull request #362 from hecrj/fix/target-quad-pixels"

Browse Source 
This reverts commit 40501f630d, reversing
changes made to 5324eb1024.
This commit is contained in:
Héctor Ramón Jiménez 2020-05-28 22:44:52 +02:00
parent d3db055583
commit 7f9813d4b3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wgpu/src/shader/quad.vert
View File

@ -21,14 +21,14 @@ layout(location = 4) out float o_BorderRadius;
layout(location = 5) out float o_BorderWidth; layout(location = 5) out float o_BorderWidth;
void main() { void main() {
vec2 p_Pos = floor(i_Pos * u_Scale); vec2 p_Pos = i_Pos * u_Scale;
vec2 p_Scale = floor(i_Scale * u_Scale); vec2 p_Scale = i_Scale * u_Scale;
mat4 i_Transform = mat4( mat4 i_Transform = mat4(
vec4(p_Scale.x, 0.0, 0.0, 0.0), vec4(p_Scale.x + 1.0, 0.0, 0.0, 0.0),
vec4(0.0, p_Scale.y, 0.0, 0.0), vec4(0.0, p_Scale.y + 1.0, 0.0, 0.0),
vec4(0.0, 0.0, 1.0, 0.0), vec4(0.0, 0.0, 1.0, 0.0),
vec4(p_Pos, 0.0, 1.0) vec4(p_Pos - vec2(0.5, 0.5), 0.0, 1.0)
); );
o_Color = i_Color; o_Color = i_Color;
@ -36,7 +36,7 @@ void main() {
o_Pos = p_Pos; o_Pos = p_Pos;
o_Scale = p_Scale; o_Scale = p_Scale;
o_BorderRadius = i_BorderRadius * u_Scale; o_BorderRadius = i_BorderRadius * u_Scale;
o_BorderWidth = floor(i_BorderWidth * u_Scale); o_BorderWidth = i_BorderWidth * u_Scale;
gl_Position = u_Transform * i_Transform * vec4(v_Pos, 0.0, 1.0); gl_Position = u_Transform * i_Transform * vec4(v_Pos, 0.0, 1.0);
} }

BIN
wgpu/src/shader/quad.vert.spv
View File

Binary file not shown.