OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shader_enums: Move MAX_DRAW_BUFFERS to this file.

Browse Source 
We include shader_enums.h from freedreno's compiler for both GL and
Vulkan, and the main/config.h include resulted in polluting the
namespace with things like MAX_VIEWPORTS that other Vulkan drivers use
as their driver-specific maximums.

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
This commit is contained in:
Eric Anholt
2019-09-19 10:54:08 -07:00
parent 6c858b9a91
commit 7a4647ee39
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/shader_enums.h
View File

@@ -27,7 +27,9 @@
#define SHADER_ENUMS_H #define SHADER_ENUMS_H
#include <stdbool.h> #include <stdbool.h>
#include "mesa/main/config.h"
/* Project-wide (GL and Vulkan) maximum. */
#define MAX_DRAW_BUFFERS 8
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

7
src/mesa/main/config.h
View File

@@ -31,6 +31,7 @@
#ifndef MESA_CONFIG_H_INCLUDED #ifndef MESA_CONFIG_H_INCLUDED
#define MESA_CONFIG_H_INCLUDED #define MESA_CONFIG_H_INCLUDED
#include "compiler/shader_enums.h"
/** /**
* \name OpenGL implementation limits * \name OpenGL implementation limits
@@ -224,12 +225,6 @@
/*@}*/ /*@}*/
/** For GL_ARB_draw_buffers */
/*@{*/
#define MAX_DRAW_BUFFERS 8
/*@}*/
/** For GL_EXT_framebuffer_object */ /** For GL_EXT_framebuffer_object */
/*@{*/ /*@{*/
#define MAX_COLOR_ATTACHMENTS 8 #define MAX_COLOR_ATTACHMENTS 8