forked from bartvdbraak/blender
Remove volatile, causing issues w/ GCC/ubsan
Was Cygwin workaround, no longer needed.
This commit is contained in:
parent
ba98f06acc
commit
c6c49d90dc
@ -57,7 +57,7 @@ typedef struct ShadeSample {
|
||||
void shade_material_loop(struct ShadeInput *shi, struct ShadeResult *shr);
|
||||
|
||||
void shade_input_set_triangle_i(struct ShadeInput *shi, struct ObjectInstanceRen *obi, struct VlakRen *vlr, short i1, short i2, short i3);
|
||||
void shade_input_set_triangle(struct ShadeInput *shi, volatile int obi, volatile int facenr, int normal_flip);
|
||||
void shade_input_set_triangle(struct ShadeInput *shi, int obi, int facenr, int normal_flip);
|
||||
void shade_input_copy_triangle(struct ShadeInput *shi, struct ShadeInput *from);
|
||||
void shade_input_calc_viewco(struct ShadeInput *shi, float x, float y, float z, float view[3], float dxyview[2], float co[3], float dxco[3], float dyco[3]);
|
||||
void shade_input_set_viewco(struct ShadeInput *shi, float x, float y, float sx, float sy, float z);
|
||||
|
@ -292,12 +292,8 @@ void shade_input_set_triangle_i(ShadeInput *shi, ObjectInstanceRen *obi, VlakRen
|
||||
}
|
||||
}
|
||||
|
||||
/* note, facenr declared volatile due to over-eager -O2 optimization's
|
||||
* on cygwin (particularly -frerun-cse-after-loop)
|
||||
*/
|
||||
|
||||
/* copy data from face to ShadeInput, scanline case */
|
||||
void shade_input_set_triangle(ShadeInput *shi, volatile int obi, volatile int facenr, int UNUSED(normal_flip))
|
||||
void shade_input_set_triangle(ShadeInput *shi, int obi, int facenr, int UNUSED(normal_flip))
|
||||
{
|
||||
if (facenr > 0) {
|
||||
shi->obi = &R.objectinstance[obi];
|
||||
|
Loading…
Reference in New Issue
Block a user