mesa: Remove inclusion of compiler.h from mtypes.h.
mtypes.h does not use any symbols from compiler.h. Also add the required headers for files that depended on symbols from compiler.h but were indirectly including compiler.h through mtypes.h.
This commit is contained in:
parent
e7242b6e8a
commit
9846b06271
|
@ -30,6 +30,8 @@
|
|||
*/
|
||||
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
#include "main/mtypes.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "brw_util.h"
|
||||
|
|
|
@ -32,6 +32,9 @@
|
|||
#ifndef __MACH64_IOCTL_H__
|
||||
#define __MACH64_IOCTL_H__
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "mach64_dri.h"
|
||||
#include "mach64_reg.h"
|
||||
#include "mach64_lock.h"
|
||||
|
|
|
@ -36,7 +36,6 @@
|
|||
|
||||
#include "main/glheader.h"
|
||||
#include "main/config.h"
|
||||
#include "main/compiler.h"
|
||||
#include "main/mfeatures.h"
|
||||
#include "glapi/glapi.h"
|
||||
#include "math/m_matrix.h" /* GLmatrix */
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
#define TEXSTATE_H
|
||||
|
||||
|
||||
#include "compiler.h"
|
||||
#include "mtypes.h"
|
||||
|
||||
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
* \author Ian Romanick <ian.d.romanick@intel.com>
|
||||
*/
|
||||
|
||||
#include "main/compiler.h"
|
||||
#include "main/mtypes.h"
|
||||
#include "prog_parameter.h"
|
||||
#include "prog_parameter_layout.h"
|
||||
|
|
|
@ -33,6 +33,8 @@
|
|||
*/
|
||||
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
#include "st_context.h"
|
||||
#include "st_atom.h"
|
||||
#include "pipe/p_context.h"
|
||||
|
|
|
@ -33,6 +33,8 @@
|
|||
*/
|
||||
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
#include "st_context.h"
|
||||
#include "st_atom.h"
|
||||
#include "pipe/p_context.h"
|
||||
|
|
|
@ -214,7 +214,7 @@ src_register( struct st_translate *t,
|
|||
return ureg_src_undef();
|
||||
|
||||
case PROGRAM_TEMPORARY:
|
||||
ASSERT(index >= 0);
|
||||
assert(index >= 0);
|
||||
if (ureg_dst_is_undef(t->temps[index]))
|
||||
t->temps[index] = ureg_DECL_temporary( t->ureg );
|
||||
assert(index < Elements(t->temps));
|
||||
|
@ -224,7 +224,7 @@ src_register( struct st_translate *t,
|
|||
case PROGRAM_ENV_PARAM:
|
||||
case PROGRAM_LOCAL_PARAM:
|
||||
case PROGRAM_UNIFORM:
|
||||
ASSERT(index >= 0);
|
||||
assert(index >= 0);
|
||||
return t->constants[index];
|
||||
case PROGRAM_STATE_VAR:
|
||||
case PROGRAM_CONSTANT: /* ie, immediate */
|
||||
|
|
|
@ -25,14 +25,14 @@
|
|||
*
|
||||
**************************************************************************/
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "st_context.h"
|
||||
#include "st_format.h"
|
||||
#include "st_texture.h"
|
||||
#include "st_cb_fbo.h"
|
||||
#include "main/enums.h"
|
||||
|
||||
#undef Elements /* fix re-defined macro warning */
|
||||
|
||||
#include "pipe/p_state.h"
|
||||
#include "pipe/p_context.h"
|
||||
#include "pipe/p_defines.h"
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
|
||||
#include "main/glheader.h"
|
||||
#include "main/bufferobj.h"
|
||||
#include "main/compiler.h"
|
||||
#include "main/enums.h"
|
||||
#include "main/state.h"
|
||||
|
||||
|
|
Loading…
Reference in New Issue