Seriously. This fixes fragment-and-vertex-texturing in piglit and probably
a boatload of other stuff.
};
struct i915_rasterizer_state {
};
struct i915_rasterizer_state {
+ struct pipe_rasterizer_state templ;
+
unsigned light_twoside : 1;
unsigned st;
enum interp_mode color_interp;
unsigned light_twoside : 1;
unsigned st;
enum interp_mode color_interp;
unsigned LIS7;
unsigned sc[1];
unsigned LIS7;
unsigned sc[1];
- struct pipe_rasterizer_state templ;
-
union { float f; unsigned u; } ds[2];
};
struct i915_sampler_state {
union { float f; unsigned u; } ds[2];
};
struct i915_sampler_state {
+ const struct pipe_sampler_state templ;
- const struct pipe_sampler_state *templ;
unsigned minlod;
unsigned maxlod;
};
unsigned minlod;
unsigned maxlod;
};
unsigned minFilt, magFilt;
unsigned mipFilt;
unsigned minFilt, magFilt;
unsigned mipFilt;
+ memcpy(&cso->templ, sampler, sizeof(struct pipe_sampler_state));
mipFilt = translate_mip_filter(sampler->min_mip_filter);
minFilt = translate_img_filter( sampler->min_img_filter );
magFilt = translate_img_filter( sampler->mag_img_filter );
mipFilt = translate_mip_filter(sampler->min_mip_filter);
minFilt = translate_img_filter( sampler->min_img_filter );
magFilt = translate_img_filter( sampler->mag_img_filter );
if (sampler->max_anisotropy > 1)
minFilt = magFilt = FILTER_ANISOTROPIC;
if (sampler->max_anisotropy > 1)
minFilt = magFilt = FILTER_ANISOTROPIC;