v3d: Drop maximum number of texture units down to 16.
This is the GLES 3.2 minmax, and also what the closed source driver does. Avoids hitting OOMs in the CTS's dEQP-GLES3.functional.texture.units.all_units.only_cube.1.
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
/* Not specifically a hardware limit, just coordination between compiler and
|
||||
* driver.
|
||||
*/
|
||||
#define V3D_MAX_TEXTURE_SAMPLERS 32
|
||||
#define V3D_MAX_TEXTURE_SAMPLERS 16
|
||||
|
||||
#define V3D_MAX_MIP_LEVELS 12
|
||||
|
||||
|
@@ -118,11 +118,11 @@ struct v3d_sampler_state {
|
||||
};
|
||||
|
||||
struct v3d_texture_stateobj {
|
||||
struct pipe_sampler_view *textures[PIPE_MAX_SAMPLERS];
|
||||
struct pipe_sampler_view *textures[V3D_MAX_TEXTURE_SAMPLERS];
|
||||
unsigned num_textures;
|
||||
struct pipe_sampler_state *samplers[PIPE_MAX_SAMPLERS];
|
||||
struct pipe_sampler_state *samplers[V3D_MAX_TEXTURE_SAMPLERS];
|
||||
unsigned num_samplers;
|
||||
struct v3d_cl_reloc texture_state[PIPE_MAX_SAMPLERS];
|
||||
struct v3d_cl_reloc texture_state[V3D_MAX_TEXTURE_SAMPLERS];
|
||||
};
|
||||
|
||||
struct v3d_shader_uniform_info {
|
||||
|
Reference in New Issue
Block a user