v3d: Avoid duplicating limits defines between gallium and v3d core.

We don't want to pull the compiler into every include in the gallium
driver, so just make a new little header to store the limits.
This commit is contained in:
Eric Anholt
2019-01-18 15:36:15 -08:00
parent fe6a21c867
commit 3e743d8cd8
9 changed files with 52 additions and 17 deletions
+1
View File
@@ -21,6 +21,7 @@ BROADCOM_FILES = \
common/v3d_debug.c \
common/v3d_debug.h \
common/v3d_device_info.h \
common/v3d_limits.h \
common/v3d_macros.h \
compiler/nir_to_vir.c \
compiler/vir.c \
+41
View File
@@ -0,0 +1,41 @@
/*
* Copyright © 2019 Broadcom
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
#ifndef V3D_LIMITS_H
#define V3D_LIMITS_H
#define V3D_MAX_FS_INPUTS 64
#define V3D_MAX_VS_INPUTS 64
/* Not specifically a hardware limit, just coordination between compiler and
* driver.
*/
#define V3D_MAX_TEXTURE_SAMPLERS 32
#define V3D_MAX_MIP_LEVELS 12
#define V3D_MAX_SAMPLES 4
#define V3D_MAX_DRAW_BUFFERS 4
#endif /* V3D_LIMITS_H */
+1 -5
View File
@@ -34,6 +34,7 @@
#include "util/macros.h"
#include "common/v3d_debug.h"
#include "common/v3d_device_info.h"
#include "common/v3d_limits.h"
#include "compiler/nir/nir.h"
#include "util/list.h"
#include "util/u_math.h"
@@ -41,11 +42,6 @@
#include "qpu/qpu_instr.h"
#include "pipe/p_state.h"
#define V3D_MAX_TEXTURE_SAMPLERS 32
#define V3D_MAX_SAMPLES 4
#define V3D_MAX_FS_INPUTS 64
#define V3D_MAX_VS_INPUTS 64
struct nir_builder;
struct v3d_fs_inputs {