[Mesa-dev] [PATCH 09/13] i965: Drop #include of main/glheader.h.

[Ian Romanick]

Have you built this series with debug and release builds?  There have
been cases in the past where removing or changing headers worked fine in
one but not the other.

On 11/23/2015 01:55 PM, Matt Turner wrote:
> It's never used.
> ---
>  src/mesa/drivers/dri/i965/brw_clear.c          | 1 -
>  src/mesa/drivers/dri/i965/brw_clip.c           | 1 -
>  src/mesa/drivers/dri/i965/brw_clip_line.c      | 1 -
>  src/mesa/drivers/dri/i965/brw_clip_point.c     | 1 -
>  src/mesa/drivers/dri/i965/brw_clip_tri.c       | 1 -
>  src/mesa/drivers/dri/i965/brw_clip_unfilled.c  | 1 -
>  src/mesa/drivers/dri/i965/brw_clip_util.c      | 1 -
>  src/mesa/drivers/dri/i965/brw_compute.c        | 1 -
>  src/mesa/drivers/dri/i965/brw_curbe.c          | 1 -
>  src/mesa/drivers/dri/i965/brw_draw.c           | 1 -
>  src/mesa/drivers/dri/i965/brw_draw_upload.c    | 1 -
>  src/mesa/drivers/dri/i965/brw_ff_gs.c          | 1 -
>  src/mesa/drivers/dri/i965/brw_ff_gs_emit.c     | 1 -
>  src/mesa/drivers/dri/i965/brw_sf.c             | 1 -
>  src/mesa/drivers/dri/i965/brw_sf_emit.c        | 1 -
>  src/mesa/drivers/dri/i965/brw_tex.c            | 1 -
>  src/mesa/drivers/dri/i965/gen8_draw_upload.c   | 1 -
>  src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | 1 -
>  src/mesa/drivers/dri/i965/intel_pixel_copy.c   | 1 -
>  src/mesa/drivers/dri/i965/intel_pixel_draw.c   | 1 -
>  src/mesa/drivers/dri/i965/intel_pixel_read.c   | 1 -
>  src/mesa/drivers/dri/i965/intel_screen.c       | 1 -
>  src/mesa/drivers/dri/i965/intel_state.c        | 1 -
>  src/mesa/drivers/dri/i965/intel_tex_image.c    | 1 -
>  24 files changed, 24 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_clear.c b/src/mesa/drivers/dri/i965/brw_clear.c
> index b011955..841ba5d 100644
> --- a/src/mesa/drivers/dri/i965/brw_clear.c
> +++ b/src/mesa/drivers/dri/i965/brw_clear.c
> @@ -24,7 +24,6 @@
>   * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>   */
>  
> -#include "main/glheader.h"
>  #include "main/mtypes.h"
>  #include "main/condrender.h"
>  #include "swrast/swrast.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c
> index 2d5abc7..9db35ce 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip.c
> @@ -29,7 +29,6 @@
>    *   Keith Whitwell <keithw at vmware.com>
>    */
>  
> -#include "main/glheader.h"
>  #include "main/macros.h"
>  #include "main/enums.h"
>  
> diff --git a/src/mesa/drivers/dri/i965/brw_clip_line.c b/src/mesa/drivers/dri/i965/brw_clip_line.c
> index 8e34f7c..d59e884 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip_line.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip_line.c
> @@ -29,7 +29,6 @@
>    *   Keith Whitwell <keithw at vmware.com>
>    */
>  
> -#include "main/glheader.h"
>  #include "main/macros.h"
>  #include "main/enums.h"
>  #include "program/program.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_clip_point.c b/src/mesa/drivers/dri/i965/brw_clip_point.c
> index 81487d3..5cf2f5e 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip_point.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip_point.c
> @@ -29,7 +29,6 @@
>    *   Keith Whitwell <keithw at vmware.com>
>    */
>  
> -#include "main/glheader.h"
>  #include "main/macros.h"
>  #include "main/enums.h"
>  #include "program/program.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_clip_tri.c b/src/mesa/drivers/dri/i965/brw_clip_tri.c
> index cca7eb1..38ab007 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip_tri.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip_tri.c
> @@ -29,7 +29,6 @@
>    *   Keith Whitwell <keithw at vmware.com>
>    */
>  
> -#include "main/glheader.h"
>  #include "main/macros.h"
>  #include "main/enums.h"
>  #include "program/program.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_clip_unfilled.c b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
> index 9a4d2a9..214a346 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
> @@ -29,7 +29,6 @@
>    *   Keith Whitwell <keithw at vmware.com>
>    */
>  
> -#include "main/glheader.h"
>  #include "main/macros.h"
>  #include "main/enums.h"
>  #include "program/program.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_clip_util.c b/src/mesa/drivers/dri/i965/brw_clip_util.c
> index 73ba85e..713d445 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip_util.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip_util.c
> @@ -30,7 +30,6 @@
>    */
>  
>  
> -#include "main/glheader.h"
>  #include "main/macros.h"
>  #include "main/enums.h"
>  #include "program/program.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_compute.c b/src/mesa/drivers/dri/i965/brw_compute.c
> index fe991a4..d9f181a 100644
> --- a/src/mesa/drivers/dri/i965/brw_compute.c
> +++ b/src/mesa/drivers/dri/i965/brw_compute.c
> @@ -24,7 +24,6 @@
>  #include <sys/errno.h>
>  
>  #include "main/condrender.h"
> -#include "main/glheader.h"
>  #include "main/mtypes.h"
>  #include "main/state.h"
>  #include "brw_context.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c
> index a149ce3..b777bce 100644
> --- a/src/mesa/drivers/dri/i965/brw_curbe.c
> +++ b/src/mesa/drivers/dri/i965/brw_curbe.c
> @@ -50,7 +50,6 @@
>   */
>  
>  
> -#include "main/glheader.h"
>  #include "main/context.h"
>  #include "main/macros.h"
>  #include "main/enums.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
> index bff484f..f250208 100644
> --- a/src/mesa/drivers/dri/i965/brw_draw.c
> +++ b/src/mesa/drivers/dri/i965/brw_draw.c
> @@ -25,7 +25,6 @@
>  
>  #include <sys/errno.h>
>  
> -#include "main/glheader.h"
>  #include "main/context.h"
>  #include "main/condrender.h"
>  #include "main/samplerobj.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
> index a0ae015..ea0f6f2 100644
> --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
> +++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
> @@ -23,7 +23,6 @@
>   * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>   */
>  
> -#include "main/glheader.h"
>  #include "main/bufferobj.h"
>  #include "main/context.h"
>  #include "main/enums.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs.c b/src/mesa/drivers/dri/i965/brw_ff_gs.c
> index f72f37f..c329ece 100644
> --- a/src/mesa/drivers/dri/i965/brw_ff_gs.c
> +++ b/src/mesa/drivers/dri/i965/brw_ff_gs.c
> @@ -29,7 +29,6 @@
>    *   Keith Whitwell <keithw at vmware.com>
>    */
>  
> -#include "main/glheader.h"
>  #include "main/macros.h"
>  #include "main/enums.h"
>  #include "main/transformfeedback.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c b/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
> index 830fc6e..8589dab 100644
> --- a/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
> +++ b/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
> @@ -30,7 +30,6 @@
>    */
>  
>  
> -#include "main/glheader.h"
>  #include "main/macros.h"
>  #include "main/enums.h"
>  
> diff --git a/src/mesa/drivers/dri/i965/brw_sf.c b/src/mesa/drivers/dri/i965/brw_sf.c
> index 872464c..5acbf18 100644
> --- a/src/mesa/drivers/dri/i965/brw_sf.c
> +++ b/src/mesa/drivers/dri/i965/brw_sf.c
> @@ -30,7 +30,6 @@
>    */
>  
>  
> -#include "main/glheader.h"
>  #include "main/macros.h"
>  #include "main/mtypes.h"
>  #include "main/enums.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_sf_emit.c b/src/mesa/drivers/dri/i965/brw_sf_emit.c
> index b3ee5c1..ea6d9d8 100644
> --- a/src/mesa/drivers/dri/i965/brw_sf_emit.c
> +++ b/src/mesa/drivers/dri/i965/brw_sf_emit.c
> @@ -30,7 +30,6 @@
>    */
>  
>  
> -#include "main/glheader.h"
>  #include "main/macros.h"
>  #include "main/enums.h"
>  
> diff --git a/src/mesa/drivers/dri/i965/brw_tex.c b/src/mesa/drivers/dri/i965/brw_tex.c
> index 2cb9aa6..7aebac6 100644
> --- a/src/mesa/drivers/dri/i965/brw_tex.c
> +++ b/src/mesa/drivers/dri/i965/brw_tex.c
> @@ -30,7 +30,6 @@
>    */
>  
>  
> -#include "main/glheader.h"
>  #include "main/mtypes.h"
>  #include "main/teximage.h"
>  
> diff --git a/src/mesa/drivers/dri/i965/gen8_draw_upload.c b/src/mesa/drivers/dri/i965/gen8_draw_upload.c
> index 1b48643..198d612 100644
> --- a/src/mesa/drivers/dri/i965/gen8_draw_upload.c
> +++ b/src/mesa/drivers/dri/i965/gen8_draw_upload.c
> @@ -21,7 +21,6 @@
>   * IN THE SOFTWARE.
>   */
>  
> -#include "main/glheader.h"
>  #include "main/bufferobj.h"
>  #include "main/context.h"
>  #include "main/enums.h"
> diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
> index 3326ac4..699e48a 100644
> --- a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
> +++ b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
> @@ -24,7 +24,6 @@
>   */
>  
>  #include "main/blend.h"
> -#include "main/glheader.h"
>  #include "main/enums.h"
>  #include "main/image.h"
>  #include "main/colormac.h"
> diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c b/src/mesa/drivers/dri/i965/intel_pixel_copy.c
> index 066b6a2..3b5bdb8 100644
> --- a/src/mesa/drivers/dri/i965/intel_pixel_copy.c
> +++ b/src/mesa/drivers/dri/i965/intel_pixel_copy.c
> @@ -23,7 +23,6 @@
>   * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>   */
>  
> -#include "main/glheader.h"
>  #include "main/image.h"
>  #include "main/state.h"
>  #include "main/mtypes.h"
> diff --git a/src/mesa/drivers/dri/i965/intel_pixel_draw.c b/src/mesa/drivers/dri/i965/intel_pixel_draw.c
> index 0c8a918..17f6592 100644
> --- a/src/mesa/drivers/dri/i965/intel_pixel_draw.c
> +++ b/src/mesa/drivers/dri/i965/intel_pixel_draw.c
> @@ -23,7 +23,6 @@
>   * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>   */
>  
> -#include "main/glheader.h"
>  #include "main/enums.h"
>  #include "main/image.h"
>  #include "main/glformats.h"
> diff --git a/src/mesa/drivers/dri/i965/intel_pixel_read.c b/src/mesa/drivers/dri/i965/intel_pixel_read.c
> index 9bcbbd1..347f880 100644
> --- a/src/mesa/drivers/dri/i965/intel_pixel_read.c
> +++ b/src/mesa/drivers/dri/i965/intel_pixel_read.c
> @@ -23,7 +23,6 @@
>   * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>   */
>  
> -#include "main/glheader.h"
>  #include "main/enums.h"
>  #include "main/mtypes.h"
>  #include "main/macros.h"
> diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
> index d64ebad..d2f2879 100644
> --- a/src/mesa/drivers/dri/i965/intel_screen.c
> +++ b/src/mesa/drivers/dri/i965/intel_screen.c
> @@ -26,7 +26,6 @@
>  #include <errno.h>
>  #include <time.h>
>  #include <unistd.h>
> -#include "main/glheader.h"
>  #include "main/context.h"
>  #include "main/framebuffer.h"
>  #include "main/renderbuffer.h"
> diff --git a/src/mesa/drivers/dri/i965/intel_state.c b/src/mesa/drivers/dri/i965/intel_state.c
> index 2f5c901..5001a49 100644
> --- a/src/mesa/drivers/dri/i965/intel_state.c
> +++ b/src/mesa/drivers/dri/i965/intel_state.c
> @@ -23,7 +23,6 @@
>   * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>   */
>  
> -#include "main/glheader.h"
>  #include "main/context.h"
>  #include "main/macros.h"
>  #include "main/enums.h"
> diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c
> index 34b91e8..393ab48 100644
> --- a/src/mesa/drivers/dri/i965/intel_tex_image.c
> +++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
> @@ -1,5 +1,4 @@
>  
> -#include "main/glheader.h"
>  #include "main/macros.h"
>  #include "main/mtypes.h"
>  #include "main/enums.h"
>