intel: Rename genx keyword in filenames to gfxx

Commands used to do the changes:
export SEARCH_PATH="src/intel src/gallium/drivers/iris src/mesa/drivers/dri/i965"
find $SEARCH_PATH -type f -name "*gen[[:digit:]]*.*[cph]" -exec sh -c 'f="{}"; mv -- "$f" "${f/gen/gfx}"' \;
grep -E "gen[[:digit:]]+_[[:alnum:]_]*\.(c|h|cpp)" -rIl $SEARCH_PATH | xargs sed -ie "s/gen\([[:digit:]]\+_[[:alnum:]_]*\.\)\(c\|h\|cpp\)/gfx\1\2/g"
grep -E "_gen[[:digit:]]+[[:alnum:]_]*\.(c|h|cpp)" -rIl $SEARCH_PATH | xargs sed -ie "s/\(_\)gen\([[:digit:]]\+[[:alnum:]_]*\.\)\(c\|h\|cpp\)/\1gfx\2\3/g"
grep -E "GEN[[:digit:]]+[[:alnum:]_]*_H( |$)" -rIl $SEARCH_PATH | xargs sed -ie "s/GEN\([[:digit:]]\+[[:alnum:]_]*_H\)\( \|$\)/GFX\1\2/g"

Exclude the "_pack.h" changes:
grep -E "gfx[[:digit:]]+_pack\.h" -rIl $SEARCH_PATH | xargs sed -ie "s/gfx\([[:digit:]]\+_pack\.h\)/gen\1/g"

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9936>
This commit is contained in:
Anuj Phogat 2021-03-30 12:12:22 -07:00 committed by Marge Bot
parent abe9a71a09
commit dc28390e3c
46 changed files with 132 additions and 133 deletions

View File

@ -141,8 +141,8 @@ COMPILER_FILES = \
compiler/brw_vec4_vs.h \ compiler/brw_vec4_vs.h \
compiler/brw_vue_map.c \ compiler/brw_vue_map.c \
compiler/brw_wm_iz.cpp \ compiler/brw_wm_iz.cpp \
compiler/gen6_gs_visitor.cpp \ compiler/gfx6_gs_visitor.cpp \
compiler/gen6_gs_visitor.h compiler/gfx6_gs_visitor.h
COMPILER_GENERATED_FILES = \ COMPILER_GENERATED_FILES = \
compiler/brw_nir_trig_workarounds.c compiler/brw_nir_trig_workarounds.c
@ -195,8 +195,8 @@ ISL_FILES = \
isl/isl_storage_image.c isl/isl_storage_image.c
ISL_GEN4_FILES = \ ISL_GEN4_FILES = \
isl/isl_gen4.c \ isl/isl_gfx4.c \
isl/isl_gen4.h \ isl/isl_gfx4.h \
isl/isl_emit_depth_stencil.c \ isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c isl/isl_surface_state.c
@ -205,14 +205,14 @@ ISL_GEN5_FILES = \
isl/isl_surface_state.c isl/isl_surface_state.c
ISL_GEN6_FILES = \ ISL_GEN6_FILES = \
isl/isl_gen6.c \ isl/isl_gfx6.c \
isl/isl_gen6.h \ isl/isl_gfx6.h \
isl/isl_emit_depth_stencil.c \ isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c isl/isl_surface_state.c
ISL_GEN7_FILES = \ ISL_GEN7_FILES = \
isl/isl_gen7.c \ isl/isl_gfx7.c \
isl/isl_gen7.h \ isl/isl_gfx7.h \
isl/isl_emit_depth_stencil.c \ isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c isl/isl_surface_state.c
@ -221,14 +221,14 @@ ISL_GEN75_FILES = \
isl/isl_surface_state.c isl/isl_surface_state.c
ISL_GEN8_FILES = \ ISL_GEN8_FILES = \
isl/isl_gen8.c \ isl/isl_gfx8.c \
isl/isl_gen8.h \ isl/isl_gfx8.h \
isl/isl_emit_depth_stencil.c \ isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c isl/isl_surface_state.c
ISL_GEN9_FILES = \ ISL_GEN9_FILES = \
isl/isl_gen9.c \ isl/isl_gfx9.c \
isl/isl_gen9.h \ isl/isl_gfx9.h \
isl/isl_emit_depth_stencil.c \ isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c isl/isl_surface_state.c
@ -237,8 +237,8 @@ ISL_GEN11_FILES = \
isl/isl_surface_state.c isl/isl_surface_state.c
ISL_GEN12_FILES = \ ISL_GEN12_FILES = \
isl/isl_gen12.c \ isl/isl_gfx12.c \
isl/isl_gen12.h \ isl/isl_gfx12.h \
isl/isl_emit_depth_stencil.c \ isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c isl/isl_surface_state.c
@ -322,31 +322,31 @@ VULKAN_GENX_FILES := \
vulkan/genX_state.c vulkan/genX_state.c
VULKAN_GEN7_FILES := \ VULKAN_GEN7_FILES := \
vulkan/gen7_cmd_buffer.c \ vulkan/gfx7_cmd_buffer.c \
$(VULKAN_GENX_FILES) $(VULKAN_GENX_FILES)
VULKAN_GEN75_FILES := \ VULKAN_GEN75_FILES := \
vulkan/gen7_cmd_buffer.c \ vulkan/gfx7_cmd_buffer.c \
$(VULKAN_GENX_FILES) $(VULKAN_GENX_FILES)
VULKAN_GEN8_FILES := \ VULKAN_GEN8_FILES := \
vulkan/gen8_cmd_buffer.c \ vulkan/gfx8_cmd_buffer.c \
$(VULKAN_GENX_FILES) $(VULKAN_GENX_FILES)
VULKAN_GEN9_FILES := \ VULKAN_GEN9_FILES := \
vulkan/gen8_cmd_buffer.c \ vulkan/gfx8_cmd_buffer.c \
$(VULKAN_GENX_FILES) $(VULKAN_GENX_FILES)
VULKAN_GEN11_FILES := \ VULKAN_GEN11_FILES := \
vulkan/gen8_cmd_buffer.c \ vulkan/gfx8_cmd_buffer.c \
$(VULKAN_GENX_FILES) $(VULKAN_GENX_FILES)
VULKAN_GEN12_FILES := \ VULKAN_GEN12_FILES := \
vulkan/gen8_cmd_buffer.c \ vulkan/gfx8_cmd_buffer.c \
$(VULKAN_GENX_FILES) $(VULKAN_GENX_FILES)
VULKAN_GEN125_FILES := \ VULKAN_GEN125_FILES := \
vulkan/gen8_cmd_buffer.c \ vulkan/gfx8_cmd_buffer.c \
$(VULKAN_GENX_FILES) $(VULKAN_GENX_FILES)
GEN_PERF_XML_FILES = \ GEN_PERF_XML_FILES = \

View File

@ -28,7 +28,7 @@
*/ */
#include "brw_vec4_gs_visitor.h" #include "brw_vec4_gs_visitor.h"
#include "gen6_gs_visitor.h" #include "gfx6_gs_visitor.h"
#include "brw_cfg.h" #include "brw_cfg.h"
#include "brw_fs.h" #include "brw_fs.h"
#include "brw_nir.h" #include "brw_nir.h"

View File

@ -24,12 +24,12 @@
*/ */
/** /**
* \file gen6_gs_visitor.cpp * \file gfx6_gs_visitor.cpp
* *
* Gen6 geometry shader implementation * Gen6 geometry shader implementation
*/ */
#include "gen6_gs_visitor.h" #include "gfx6_gs_visitor.h"
#include "brw_eu.h" #include "brw_eu.h"
namespace brw { namespace brw {

View File

@ -22,8 +22,8 @@
* *
*/ */
#ifndef GEN6_GS_VISITOR_H #ifndef GFX6_GS_VISITOR_H
#define GEN6_GS_VISITOR_H #define GFX6_GS_VISITOR_H
#include "brw_vec4.h" #include "brw_vec4.h"
#include "brw_vec4_gs_visitor.h" #include "brw_vec4_gs_visitor.h"
@ -89,4 +89,4 @@ private:
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* GEN6_GS_VISITOR_H */ #endif /* GFX6_GS_VISITOR_H */

View File

@ -130,8 +130,8 @@ libintel_compiler_files = files(
'brw_vec4_vs.h', 'brw_vec4_vs.h',
'brw_vue_map.c', 'brw_vue_map.c',
'brw_wm_iz.cpp', 'brw_wm_iz.cpp',
'gen6_gs_visitor.cpp', 'gfx6_gs_visitor.cpp',
'gen6_gs_visitor.h', 'gfx6_gs_visitor.h',
) )
brw_nir_trig = custom_target( brw_nir_trig = custom_target(

View File

@ -28,12 +28,12 @@
#include "genxml/genX_bits.h" #include "genxml/genX_bits.h"
#include "isl.h" #include "isl.h"
#include "isl_gen4.h" #include "isl_gfx4.h"
#include "isl_gen6.h" #include "isl_gfx6.h"
#include "isl_gen7.h" #include "isl_gfx7.h"
#include "isl_gen8.h" #include "isl_gfx8.h"
#include "isl_gen9.h" #include "isl_gfx9.h"
#include "isl_gen12.h" #include "isl_gfx12.h"
#include "isl_priv.h" #include "isl_priv.h"
void void

View File

@ -21,8 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#include "isl_gen9.h" #include "isl_gfx9.h"
#include "isl_gen12.h" #include "isl_gfx12.h"
#include "isl_priv.h" #include "isl_priv.h"
void void

View File

@ -21,8 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef ISL_GEN12_H #ifndef ISL_GFX12_H
#define ISL_GEN12_H #define ISL_GFX12_H
#include "isl.h" #include "isl.h"
@ -42,4 +42,4 @@ isl_gen12_choose_image_alignment_el(const struct isl_device *dev,
} }
#endif #endif
#endif /* ISL_GEN12_H */ #endif /* ISL_GFX12_H */

View File

@ -21,7 +21,7 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#include "isl_gen4.h" #include "isl_gfx4.h"
#include "isl_priv.h" #include "isl_priv.h"
bool bool

View File

@ -21,8 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef ISL_GEN4_H #ifndef ISL_GFX4_H
#define ISL_GEN4_H #define ISL_GFX4_H
#include "isl.h" #include "isl.h"
@ -53,4 +53,4 @@ isl_gen4_choose_image_alignment_el(const struct isl_device *dev,
} }
#endif #endif
#endif /* ISL_GEN4_H */ #endif /* ISL_GFX4_H */

View File

@ -21,7 +21,7 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#include "isl_gen6.h" #include "isl_gfx6.h"
#include "isl_priv.h" #include "isl_priv.h"
bool bool

View File

@ -21,8 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef ISL_GEN6_H #ifndef ISL_GFX6_H
#define ISL_GEN6_H #define ISL_GFX6_H
#include "isl.h" #include "isl.h"
@ -48,4 +48,4 @@ isl_gen6_choose_image_alignment_el(const struct isl_device *dev,
} }
#endif #endif
#endif /* ISL_GEN6_H */ #endif /* ISL_GFX6_H */

View File

@ -21,7 +21,7 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#include "isl_gen7.h" #include "isl_gfx7.h"
#include "isl_priv.h" #include "isl_priv.h"
static bool static bool

View File

@ -21,8 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef ISL_GEN7_H #ifndef ISL_GFX7_H
#define ISL_GEN7_H #define ISL_GFX7_H
#include "isl.h" #include "isl.h"
@ -53,4 +53,4 @@ isl_gen7_choose_image_alignment_el(const struct isl_device *dev,
} }
#endif #endif
#endif /* ISL_GEN7_H */ #endif /* ISL_GFX7_H */

View File

@ -21,7 +21,7 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#include "isl_gen8.h" #include "isl_gfx8.h"
#include "isl_priv.h" #include "isl_priv.h"
bool bool

View File

@ -21,8 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef ISL_GEN8_H #ifndef ISL_GFX8_H
#define ISL_GEN8_H #define ISL_GFX8_H
#include "isl.h" #include "isl.h"
@ -48,4 +48,4 @@ isl_gen8_choose_image_alignment_el(const struct isl_device *dev,
} }
#endif #endif
#endif /* ISL_GEN8_H */ #endif /* ISL_GFX8_H */

View File

@ -21,8 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#include "isl_gen8.h" #include "isl_gfx8.h"
#include "isl_gen9.h" #include "isl_gfx9.h"
#include "isl_priv.h" #include "isl_priv.h"
/** /**

View File

@ -21,8 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef ISL_GEN9_H #ifndef ISL_GFX9_H
#define ISL_GEN9_H #define ISL_GFX9_H
#include "isl.h" #include "isl.h"
@ -42,4 +42,4 @@ isl_gen9_choose_image_alignment_el(const struct isl_device *dev,
} }
#endif #endif
#endif /* ISL_GEN9_H */ #endif /* ISL_GFX9_H */

View File

@ -24,38 +24,38 @@ isl_gen_files = files(
) )
isl_gen4_files = files( isl_gen4_files = files(
'isl_gen4.c', 'isl_gfx4.c',
'isl_gen4.h', 'isl_gfx4.h',
) )
isl_gen6_files = files( isl_gen6_files = files(
'isl_gen6.c', 'isl_gfx6.c',
'isl_gen6.h', 'isl_gfx6.h',
) )
isl_gen7_files = files( isl_gen7_files = files(
'isl_gen7.c', 'isl_gfx7.c',
'isl_gen7.h', 'isl_gfx7.h',
) )
isl_gen8_files = files( isl_gen8_files = files(
'isl_gen8.c', 'isl_gfx8.c',
'isl_gen8.h', 'isl_gfx8.h',
) )
isl_gen9_files = files( isl_gen9_files = files(
'isl_gen9.c', 'isl_gfx9.c',
'isl_gen9.h', 'isl_gfx9.h',
) )
isl_gen12_files = files( isl_gen12_files = files(
'isl_gen12.c', 'isl_gfx12.c',
'isl_gen12.h', 'isl_gfx12.h',
) )
isl_gen125_files = files( isl_gen125_files = files(
'isl_gen12.c', 'isl_gfx12.c',
'isl_gen12.h', 'isl_gfx12.h',
) )
isl_gen_libs = [] isl_gen_libs = []

View File

@ -98,7 +98,7 @@ struct gen_context_parameters {
typedef void (*gen_context_init_t)(const struct gen_context_parameters *, uint32_t *, uint32_t *); typedef void (*gen_context_init_t)(const struct gen_context_parameters *, uint32_t *, uint32_t *);
#include "gen8_context.h" #include "gfx8_context.h"
#include "gen10_context.h" #include "gfx10_context.h"
#endif /* INTEL_CONTEXT_H */ #endif /* INTEL_CONTEXT_H */

View File

@ -21,8 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef GEN10_CONTEXT_H #ifndef GFX10_CONTEXT_H
#define GEN10_CONTEXT_H #define GFX10_CONTEXT_H
static inline void gen10_render_context_init(const struct gen_context_parameters *params, static inline void gen10_render_context_init(const struct gen_context_parameters *params,
uint32_t *data, uint32_t *size) uint32_t *data, uint32_t *size)
@ -165,4 +165,4 @@ static inline void gen10_video_context_init(const struct gen_context_parameters
*data++ = MI_BATCH_BUFFER_END | 1 /* End Context */; *data++ = MI_BATCH_BUFFER_END | 1 /* End Context */;
} }
#endif /* GEN10_CONTEXT_H */ #endif /* GFX10_CONTEXT_H */

View File

@ -21,8 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef GEN8_CONTEXT_H #ifndef GFX8_CONTEXT_H
#define GEN8_CONTEXT_H #define GFX8_CONTEXT_H
static inline void gen8_render_context_init(const struct gen_context_parameters *params, static inline void gen8_render_context_init(const struct gen_context_parameters *params,
uint32_t *data, uint32_t *size) uint32_t *data, uint32_t *size)
@ -155,4 +155,4 @@ static inline void gen8_video_context_init(const struct gen_context_parameters *
*data++ = MI_BATCH_BUFFER_END; *data++ = MI_BATCH_BUFFER_END;
} }
#endif /* GEN8_CONTEXT_H */ #endif /* GFX8_CONTEXT_H */

View File

@ -113,7 +113,7 @@ configure_file(
libintel_dump_gpu = shared_library( libintel_dump_gpu = shared_library(
'intel_dump_gpu', 'intel_dump_gpu',
files( files(
'gen_context.h', 'gen8_context.h', 'gen10_context.h', 'intel_aub.h', 'gen_context.h', 'gfx8_context.h', 'gfx10_context.h', 'intel_aub.h',
'aub_write.h', 'aub_write.c', 'intel_dump_gpu.c', 'aub_write.h', 'aub_write.c', 'intel_dump_gpu.c',
), ),
dependencies : [dep_dl, idep_mesautil], dependencies : [dep_dl, idep_mesautil],

View File

@ -2324,7 +2324,7 @@ genX(graphics_pipeline_create)(
#endif #endif
#if 0 #if 0
/* From gen7_vs_state.c */ /* From gfx7_vs_state.c */
/** /**
* From Graphics BSpec: 3D-Media-GPGPU Engine > 3D Pipeline Stages > * From Graphics BSpec: 3D-Media-GPGPU Engine > 3D Pipeline Stages >

View File

@ -57,10 +57,10 @@ anv_gen_files = files(
'genX_query.c', 'genX_query.c',
'genX_state.c', 'genX_state.c',
) )
foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']], foreach g : [['70', ['gfx7_cmd_buffer.c']], ['75', ['gfx7_cmd_buffer.c']],
['80', ['gen8_cmd_buffer.c']], ['90', ['gen8_cmd_buffer.c']], ['80', ['gfx8_cmd_buffer.c']], ['90', ['gfx8_cmd_buffer.c']],
['110', ['gen8_cmd_buffer.c']], ['120', ['gen8_cmd_buffer.c']], ['110', ['gfx8_cmd_buffer.c']], ['120', ['gfx8_cmd_buffer.c']],
['125', ['gen8_cmd_buffer.c']]] ['125', ['gfx8_cmd_buffer.c']]]
_gen = g[0] _gen = g[0]
libanv_gen_libs += static_library( libanv_gen_libs += static_library(
'anv_gen@0@'.format(_gen), 'anv_gen@0@'.format(_gen),

View File

@ -62,19 +62,19 @@ i965_FILES = \
brw_wm.c \ brw_wm.c \
brw_wm.h \ brw_wm.h \
brw_wm_surface_state.c \ brw_wm_surface_state.c \
gen4_blorp_exec.h \ gfx4_blorp_exec.h \
gen6_clip_state.c \ gfx6_clip_state.c \
gen6_constant_state.c \ gfx6_constant_state.c \
gen6_multisample_state.c \ gfx6_multisample_state.c \
gen6_queryobj.c \ gfx6_queryobj.c \
gen6_sampler_state.c \ gfx6_sampler_state.c \
gen6_sol.c \ gfx6_sol.c \
gen6_urb.c \ gfx6_urb.c \
gen7_l3_state.c \ gfx7_l3_state.c \
gen7_sol_state.c \ gfx7_sol_state.c \
gen7_urb.c \ gfx7_urb.c \
gen8_depth_state.c \ gfx8_depth_state.c \
gen8_multisample_state.c \ gfx8_multisample_state.c \
hsw_queryobj.c \ hsw_queryobj.c \
hsw_sol.c \ hsw_sol.c \
brw_batch.c \ brw_batch.c \

View File

@ -1313,7 +1313,7 @@ bool brw_is_query_pipelined(struct brw_query_object *query);
uint64_t brw_raw_timestamp_delta(struct brw_context *brw, uint64_t brw_raw_timestamp_delta(struct brw_context *brw,
uint64_t time0, uint64_t time1); uint64_t time0, uint64_t time1);
/** gen6_queryobj.c */ /** gfx6_queryobj.c */
void gen6_init_queryobj_functions(struct dd_function_table *functions); void gen6_init_queryobj_functions(struct dd_function_table *functions);
void brw_write_timestamp(struct brw_context *brw, struct brw_bo *bo, int idx); void brw_write_timestamp(struct brw_context *brw, struct brw_bo *bo, int idx);
void brw_write_depth_count(struct brw_context *brw, struct brw_bo *bo, int idx); void brw_write_depth_count(struct brw_context *brw, struct brw_bo *bo, int idx);
@ -1444,7 +1444,7 @@ extern int brw_translate_stencil_op(GLenum op);
/* brw_sync.c */ /* brw_sync.c */
void brw_init_syncobj_functions(struct dd_function_table *functions); void brw_init_syncobj_functions(struct dd_function_table *functions);
/* gen6_sol.c */ /* gfx6_sol.c */
struct gl_transform_feedback_object * struct gl_transform_feedback_object *
brw_new_transform_feedback(struct gl_context *ctx, GLuint name); brw_new_transform_feedback(struct gl_context *ctx, GLuint name);
void void
@ -1470,7 +1470,7 @@ brw_get_transform_feedback_vertex_count(struct gl_context *ctx,
struct gl_transform_feedback_object *obj, struct gl_transform_feedback_object *obj,
GLuint stream); GLuint stream);
/* gen7_sol_state.c */ /* gfx7_sol_state.c */
void void
gen7_begin_transform_feedback(struct gl_context *ctx, GLenum mode, gen7_begin_transform_feedback(struct gl_context *ctx, GLenum mode,
struct gl_transform_feedback_object *obj); struct gl_transform_feedback_object *obj);
@ -1526,13 +1526,13 @@ gen6_get_sample_position(struct gl_context *ctx,
GLuint index, GLuint index,
GLfloat *result); GLfloat *result);
/* gen8_multisample_state.c */ /* gfx8_multisample_state.c */
void gen8_emit_3dstate_sample_pattern(struct brw_context *brw); void gen8_emit_3dstate_sample_pattern(struct brw_context *brw);
/* gen7_l3_state.c */ /* gfx7_l3_state.c */
void brw_emit_l3_state(struct brw_context *brw); void brw_emit_l3_state(struct brw_context *brw);
/* gen7_urb.c */ /* gfx7_urb.c */
void void
gen7_emit_push_constant_state(struct brw_context *brw, unsigned vs_size, gen7_emit_push_constant_state(struct brw_context *brw, unsigned vs_size,
unsigned hs_size, unsigned ds_size, unsigned hs_size, unsigned ds_size,

View File

@ -46,7 +46,7 @@
* stall occurs at CMD_CONST_BUFFER time. * stall occurs at CMD_CONST_BUFFER time.
* *
* On gen6+, constant handling becomes a much simpler set of per-unit state. * On gen6+, constant handling becomes a much simpler set of per-unit state.
* See gen6_upload_vec4_push_constants() in gen6_vs_state.c for that code. * See gen6_upload_vec4_push_constants() in gfx6_vs_state.c for that code.
*/ */

View File

@ -144,7 +144,7 @@ brw_depthbuffer_format(struct brw_context *brw);
void brw_upload_state_base_address(struct brw_context *brw); void brw_upload_state_base_address(struct brw_context *brw);
/* gen8_depth_state.c */ /* gfx8_depth_state.c */
void gen8_write_pma_stall_bits(struct brw_context *brw, void gen8_write_pma_stall_bits(struct brw_context *brw,
uint32_t pma_stall_bits); uint32_t pma_stall_bits);
@ -257,7 +257,7 @@ void brw_emit_sampler_state(struct brw_context *brw,
bool non_normalized_coordinates, bool non_normalized_coordinates,
uint32_t border_color_offset); uint32_t border_color_offset);
/* gen6_constant_state.c */ /* gfx6_constant_state.c */
void void
brw_populate_constant_data(struct brw_context *brw, brw_populate_constant_data(struct brw_context *brw,
const struct gl_program *prog, const struct gl_program *prog,
@ -277,7 +277,7 @@ brw_upload_cs_push_constants(struct brw_context *brw,
const struct brw_cs_prog_data *cs_prog_data, const struct brw_cs_prog_data *cs_prog_data,
struct brw_stage_state *stage_state); struct brw_stage_state *stage_state);
/* gen7_vs_state.c */ /* gfx7_vs_state.c */
void void
gen7_upload_constant_state(struct brw_context *brw, gen7_upload_constant_state(struct brw_context *brw,
const struct brw_stage_state *stage_state, const struct brw_stage_state *stage_state,
@ -292,7 +292,7 @@ void brw_upload_sf_prog(struct brw_context *brw);
bool brw_is_drawing_points(const struct brw_context *brw); bool brw_is_drawing_points(const struct brw_context *brw);
bool brw_is_drawing_lines(const struct brw_context *brw); bool brw_is_drawing_lines(const struct brw_context *brw);
/* gen7_l3_state.c */ /* gfx7_l3_state.c */
void void
gen7_restore_default_l3_config(struct brw_context *brw); gen7_restore_default_l3_config(struct brw_context *brw);

View File

@ -33,7 +33,7 @@
#include "blorp/blorp_genX_exec.h" #include "blorp/blorp_genX_exec.h"
#if GFX_VER <= 5 #if GFX_VER <= 5
#include "gen4_blorp_exec.h" #include "gfx4_blorp_exec.h"
#endif #endif
#include "brw_blorp.h" #include "brw_blorp.h"

View File

@ -87,4 +87,3 @@ brw_is_drawing_lines(const struct brw_context *brw)
} }
return false; return false;
} }

View File

@ -226,7 +226,7 @@ gen6_upload_push_constants(struct brw_context *brw,
* register space with mostly-unused data). * register space with mostly-unused data).
* *
* Compare this path to brw_curbe.c for gen4/5 push constants, and * Compare this path to brw_curbe.c for gen4/5 push constants, and
* gen6_vs_state.c for gen6+ push constants. * gfx6_vs_state.c for gen6+ push constants.
*/ */
void void
brw_upload_pull_constants(struct brw_context *brw, brw_upload_pull_constants(struct brw_context *brw,
@ -289,7 +289,7 @@ brw_upload_pull_constants(struct brw_context *brw,
* pre-loaded into a shader stage's register space at thread spawn time. * pre-loaded into a shader stage's register space at thread spawn time.
* *
* For other stages, see brw_curbe.c:brw_upload_constant_buffer for the * For other stages, see brw_curbe.c:brw_upload_constant_buffer for the
* equivalent gen4/5 code and gen6_vs_state.c:gen6_upload_push_constants for * equivalent gen4/5 code and gfx6_vs_state.c:gen6_upload_push_constants for
* gen6+. * gen6+.
*/ */
void void

View File

@ -25,7 +25,7 @@
* Kenneth Graunke <kenneth@whitecape.org> * Kenneth Graunke <kenneth@whitecape.org>
*/ */
/** @file gen6_queryobj.c /** @file gfx6_queryobj.c
* *
* Support for query objects (GL_ARB_occlusion_query, GL_ARB_timer_query, * Support for query objects (GL_ARB_occlusion_query, GL_ARB_timer_query,
* GL_EXT_transform_feedback, and friends) on platforms that support * GL_EXT_transform_feedback, and friends) on platforms that support

View File

@ -21,7 +21,7 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
/** \file gen6_sol.c /** \file gfx6_sol.c
* *
* Code to initialize the binding table entries used by transform feedback. * Code to initialize the binding table entries used by transform feedback.
*/ */

View File

@ -22,7 +22,7 @@
*/ */
/** /**
* @file gen7_sol_state.c * @file gfx7_sol_state.c
* *
* Controls the stream output logic (SOL) stage of the gen7 hardware, which is * Controls the stream output logic (SOL) stage of the gen7 hardware, which is
* used to implement GL_EXT_transform_feedback. * used to implement GL_EXT_transform_feedback.

View File

@ -81,19 +81,19 @@ files_i965 = files(
'brw_wm.c', 'brw_wm.c',
'brw_wm.h', 'brw_wm.h',
'brw_wm_surface_state.c', 'brw_wm_surface_state.c',
'gen4_blorp_exec.h', 'gfx4_blorp_exec.h',
'gen6_clip_state.c', 'gfx6_clip_state.c',
'gen6_constant_state.c', 'gfx6_constant_state.c',
'gen6_multisample_state.c', 'gfx6_multisample_state.c',
'gen6_queryobj.c', 'gfx6_queryobj.c',
'gen6_sampler_state.c', 'gfx6_sampler_state.c',
'gen6_sol.c', 'gfx6_sol.c',
'gen6_urb.c', 'gfx6_urb.c',
'gen7_l3_state.c', 'gfx7_l3_state.c',
'gen7_sol_state.c', 'gfx7_sol_state.c',
'gen7_urb.c', 'gfx7_urb.c',
'gen8_depth_state.c', 'gfx8_depth_state.c',
'gen8_multisample_state.c', 'gfx8_multisample_state.c',
'hsw_queryobj.c', 'hsw_queryobj.c',
'hsw_sol.c', 'hsw_sol.c',
'brw_batch.c', 'brw_batch.c',