Merge pull request #3757 from jamesbowman/main

tannewt · web-flow · commit c284a57a9996 · 2020-11-25T14:50:03.000-08:00
Fix opcode typo in EVE VertexFormat()
diff --git a/shared-module/_eve/__init__.c b/shared-module/_eve/__init__.c
@@ -70,8 +70,8 @@ void common_hal__eve_Vertex2f(common_hal__eve_t *eve, mp_float_t x, mp_float_t y
 
 void common_hal__eve_VertexFormat(common_hal__eve_t *eve, uint32_t frac)
 {
-    C4(eve, ((27 << 24) | ((frac & 7))));
-    eve->vscale = 1 << eve->vscale;
+    C4(eve, ((39 << 24) | ((frac & 7))));
+    eve->vscale = 1 << frac;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,8 @@ void common_hal__eve_Vertex2f(common_hal__eve_t *eve, mp_float_t x, mp_float_t y`
`70`	`70`
`71`	`71`	`void common_hal__eve_VertexFormat(common_hal__eve_t *eve, uint32_t frac)`
`72`	`72`	`{`
`73`		`- C4(eve, ((27 << 24) \| ((frac & 7))));`
`74`		`- eve->vscale = 1 << eve->vscale;`
	`73`	`+ C4(eve, ((39 << 24) \| ((frac & 7))));`
	`74`	`+ eve->vscale = 1 << frac;`
`75`	`75`	`}`
`76`	`76`
`77`	`77`