AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ilo: rename ilo_dev_info to ilo_dev

Browse Source 
With intel_winsys being embedded in it, drop the "_info" suffix.
This commit is contained in:
Chia-I Wu
2015-03-08 04:37:02 +08:00
parent 19351af53d
commit 7562f9e907
25 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/ilo/core/ilo_dev.h
+3 -3
View File
@@ -37,7 +37,7 @@
struct intel_winsys;
struct ilo_dev_info {
struct ilo_dev {
struct intel_winsys *winsys;
/* these mirror intel_winsys_info */
@@ -61,13 +61,13 @@ struct ilo_dev_info {
};
static inline int
ilo_dev_gen(const struct ilo_dev_info *dev)
ilo_dev_gen(const struct ilo_dev *dev)
{
return dev->gen_opaque;
}
static inline void
ilo_dev_assert(const struct ilo_dev_info *dev, int min_opqaue, int max_opqaue)
ilo_dev_assert(const struct ilo_dev *dev, int min_opqaue, int max_opqaue)
{
assert(dev->gen_opaque >= min_opqaue && dev->gen_opaque <= max_opqaue);
}
src/gallium/drivers/ilo/ilo_builder.c
+1 -1
View File
@@ -328,7 +328,7 @@ ilo_builder_writer_record(struct ilo_builder *builder,
*/
void
ilo_builder_init(struct ilo_builder *builder,
const struct ilo_dev_info *dev,
const struct ilo_dev *dev,
struct intel_winsys *winsys)
{
int i;
src/gallium/drivers/ilo/ilo_builder.h
+2 -2
View File
@@ -98,7 +98,7 @@ struct ilo_builder_snapshot {
};
struct ilo_builder {
const struct ilo_dev_info *dev;
const struct ilo_dev *dev;
struct intel_winsys *winsys;
uint32_t mocs;
@@ -114,7 +114,7 @@ struct ilo_builder {
void
ilo_builder_init(struct ilo_builder *builder,
const struct ilo_dev_info *dev,
const struct ilo_dev *dev,
struct intel_winsys *winsys);
void
src/gallium/drivers/ilo/ilo_context.h
+1 -1
View File
@@ -48,7 +48,7 @@ struct ilo_context {
struct pipe_context base;
struct intel_winsys *winsys;
struct ilo_dev_info *dev;
struct ilo_dev *dev;
struct util_slab_mempool transfer_mempool;
src/gallium/drivers/ilo/ilo_cp.c
+1 -1
View File
@@ -197,7 +197,7 @@ ilo_cp_destroy(struct ilo_cp *cp)
* Create a command parser.
*/
struct ilo_cp *
ilo_cp_create(const struct ilo_dev_info *dev,
ilo_cp_create(const struct ilo_dev *dev,
struct intel_winsys *winsys,
struct ilo_shader_cache *shc)
{
src/gallium/drivers/ilo/ilo_cp.h
+1 -1
View File
@@ -78,7 +78,7 @@ struct ilo_cp {
};
struct ilo_cp *
ilo_cp_create(const struct ilo_dev_info *dev,
ilo_cp_create(const struct ilo_dev *dev,
struct intel_winsys *winsys,
struct ilo_shader_cache *shc);
src/gallium/drivers/ilo/ilo_format.c
+6 -6
View File
@@ -411,7 +411,7 @@ static const struct ilo_dp_cap ilo_dp_caps[] = {
* format. Return -1 on errors.
*/
int
ilo_translate_color_format(const struct ilo_dev_info *dev,
ilo_translate_color_format(const struct ilo_dev *dev,
enum pipe_format format)
{
static const int format_mapping[PIPE_FORMAT_COUNT] = {
@@ -675,7 +675,7 @@ ilo_translate_color_format(const struct ilo_dev_info *dev,
}
static bool
ilo_format_supports_zs(const struct ilo_dev_info *dev,
ilo_format_supports_zs(const struct ilo_dev *dev,
enum pipe_format format)
{
switch (format) {
@@ -693,7 +693,7 @@ ilo_format_supports_zs(const struct ilo_dev_info *dev,
}
static bool
ilo_format_supports_rt(const struct ilo_dev_info *dev,
ilo_format_supports_rt(const struct ilo_dev *dev,
enum pipe_format format)
{
const int idx = ilo_translate_format(dev, format, PIPE_BIND_RENDER_TARGET);
@@ -714,7 +714,7 @@ ilo_format_supports_rt(const struct ilo_dev_info *dev,
}
static bool
ilo_format_supports_sampler(const struct ilo_dev_info *dev,
ilo_format_supports_sampler(const struct ilo_dev *dev,
enum pipe_format format)
{
const int idx = ilo_translate_format(dev, format, PIPE_BIND_SAMPLER_VIEW);
@@ -735,7 +735,7 @@ ilo_format_supports_sampler(const struct ilo_dev_info *dev,
}
static bool
ilo_format_supports_vb(const struct ilo_dev_info *dev,
ilo_format_supports_vb(const struct ilo_dev *dev,
enum pipe_format format)
{
const int idx = ilo_translate_format(dev, format, PIPE_BIND_VERTEX_BUFFER);
@@ -754,7 +754,7 @@ ilo_is_format_supported(struct pipe_screen *screen,
unsigned bindings)
{
struct ilo_screen *is = ilo_screen(screen);
const struct ilo_dev_info *dev = &is->dev;
const struct ilo_dev *dev = &is->dev;
unsigned bind;
if (!util_format_is_supported(format, bindings))
src/gallium/drivers/ilo/ilo_format.h
+5 -5
View File
@@ -38,7 +38,7 @@ void
ilo_init_format_functions(struct ilo_screen *is);
int
ilo_translate_color_format(const struct ilo_dev_info *dev,
ilo_translate_color_format(const struct ilo_dev *dev,
enum pipe_format format);
/**
@@ -49,7 +49,7 @@ ilo_translate_color_format(const struct ilo_dev_info *dev,
* caveats that the callers should be aware of before calling this function.
*/
static inline int
ilo_translate_format(const struct ilo_dev_info *dev,
ilo_translate_format(const struct ilo_dev *dev,
enum pipe_format format, unsigned bind)
{
switch (bind) {
@@ -127,21 +127,21 @@ ilo_translate_format(const struct ilo_dev_info *dev,
}
static inline int
ilo_translate_render_format(const struct ilo_dev_info *dev,
ilo_translate_render_format(const struct ilo_dev *dev,
enum pipe_format format)
{
return ilo_translate_format(dev, format, PIPE_BIND_RENDER_TARGET);
}
static inline int
ilo_translate_texture_format(const struct ilo_dev_info *dev,
ilo_translate_texture_format(const struct ilo_dev *dev,
enum pipe_format format)
{
return ilo_translate_format(dev, format, PIPE_BIND_SAMPLER_VIEW);
}
static inline int
ilo_translate_vertex_format(const struct ilo_dev_info *dev,
ilo_translate_vertex_format(const struct ilo_dev *dev,
enum pipe_format format)
{
return ilo_translate_format(dev, format, PIPE_BIND_VERTEX_BUFFER);
src/gallium/drivers/ilo/ilo_layout.c
+3 -3
View File
@@ -40,7 +40,7 @@ enum {
};
struct ilo_layout_params {
const struct ilo_dev_info *dev;
const struct ilo_dev *dev;
const struct pipe_resource *templ;
bool compressed;
@@ -1300,7 +1300,7 @@ layout_calculate_mcs_size(struct ilo_layout *layout,
*/
static void
layout_init_for_transfer(struct ilo_layout *layout,
const struct ilo_dev_info *dev,
const struct ilo_dev *dev,
const struct pipe_resource *templ)
{
const unsigned num_layers = (templ->target == PIPE_TEXTURE_3D) ?
@@ -1345,7 +1345,7 @@ layout_init_for_transfer(struct ilo_layout *layout,
* Initialize the layout. Callers should zero-initialize \p layout first.
*/
void ilo_layout_init(struct ilo_layout *layout,
const struct ilo_dev_info *dev,
const struct ilo_dev *dev,
const struct pipe_resource *templ)
{
struct ilo_layout_params params;
src/gallium/drivers/ilo/ilo_layout.h
+1 -1
View File
@@ -124,7 +124,7 @@ struct ilo_layout {
};
void ilo_layout_init(struct ilo_layout *layout,
const struct ilo_dev_info *dev,
const struct ilo_dev *dev,
const struct pipe_resource *templ);
bool
src/gallium/drivers/ilo/ilo_render_gen.h
+1 -1
View File
@@ -44,7 +44,7 @@ struct ilo_state_vector;
* Render Engine.
*/
struct ilo_render {
const struct ilo_dev_info *dev;
const struct ilo_dev *dev;
struct ilo_builder *builder;
struct intel_bo *workaround_bo;
src/gallium/drivers/ilo/ilo_screen.c
+1 -1
View File
@@ -670,7 +670,7 @@ ilo_screen_destroy(struct pipe_screen *screen)
}
static bool
init_dev(struct ilo_dev_info *dev, const struct intel_winsys_info *info)
init_dev(struct ilo_dev *dev, const struct intel_winsys_info *info)
{
dev->devid = info->devid;
dev->aperture_total = info->aperture_total;
src/gallium/drivers/ilo/ilo_screen.h
+1 -1
View File
@@ -39,7 +39,7 @@ struct ilo_fence;
struct ilo_screen {
struct pipe_screen base;
struct ilo_dev_info dev;
struct ilo_dev dev;
};
static inline struct ilo_screen *
src/gallium/drivers/ilo/ilo_shader.c
+5 -5
View File
@@ -442,7 +442,7 @@ ilo_shader_info_parse_tokens(struct ilo_shader_info *info)
* Create a shader state.
*/
static struct ilo_shader_state *
ilo_shader_state_create(const struct ilo_dev_info *dev,
ilo_shader_state_create(const struct ilo_dev *dev,
const struct ilo_state_vector *vec,
int type, const void *templ)
{
@@ -682,7 +682,7 @@ ilo_shader_state_use_variant(struct ilo_shader_state *state,
}
struct ilo_shader_state *
ilo_shader_create_vs(const struct ilo_dev_info *dev,
ilo_shader_create_vs(const struct ilo_dev *dev,
const struct pipe_shader_state *state,
const struct ilo_state_vector *precompile)
{
@@ -700,7 +700,7 @@ ilo_shader_create_vs(const struct ilo_dev_info *dev,
}
struct ilo_shader_state *
ilo_shader_create_gs(const struct ilo_dev_info *dev,
ilo_shader_create_gs(const struct ilo_dev *dev,
const struct pipe_shader_state *state,
const struct ilo_state_vector *precompile)
{
@@ -719,7 +719,7 @@ ilo_shader_create_gs(const struct ilo_dev_info *dev,
}
struct ilo_shader_state *
ilo_shader_create_fs(const struct ilo_dev_info *dev,
ilo_shader_create_fs(const struct ilo_dev *dev,
const struct pipe_shader_state *state,
const struct ilo_state_vector *precompile)
{
@@ -738,7 +738,7 @@ ilo_shader_create_fs(const struct ilo_dev_info *dev,
}
struct ilo_shader_state *
ilo_shader_create_cs(const struct ilo_dev_info *dev,
ilo_shader_create_cs(const struct ilo_dev *dev,
const struct pipe_compute_state *state,
const struct ilo_state_vector *precompile)
{
src/gallium/drivers/ilo/ilo_shader.h
+4 -4
View File
@@ -120,22 +120,22 @@ void
ilo_shader_cache_invalidate(struct ilo_shader_cache *shc);
struct ilo_shader_state *
ilo_shader_create_vs(const struct ilo_dev_info *dev,
ilo_shader_create_vs(const struct ilo_dev *dev,
const struct pipe_shader_state *state,
const struct ilo_state_vector *precompile);
struct ilo_shader_state *
ilo_shader_create_gs(const struct ilo_dev_info *dev,
ilo_shader_create_gs(const struct ilo_dev *dev,
const struct pipe_shader_state *state,
const struct ilo_state_vector *precompile);
struct ilo_shader_state *
ilo_shader_create_fs(const struct ilo_dev_info *dev,
ilo_shader_create_fs(const struct ilo_dev *dev,
const struct pipe_shader_state *state,
const struct ilo_state_vector *precompile);
struct ilo_shader_state *
ilo_shader_create_cs(const struct ilo_dev_info *dev,
ilo_shader_create_cs(const struct ilo_dev *dev,
const struct pipe_compute_state *state,
const struct ilo_state_vector *precompile);
src/gallium/drivers/ilo/ilo_state.c
+12 -12
View File
@@ -300,7 +300,7 @@ static void *
ilo_create_blend_state(struct pipe_context *pipe,
const struct pipe_blend_state *state)
{
const struct ilo_dev_info *dev = ilo_context(pipe)->dev;
const struct ilo_dev *dev = ilo_context(pipe)->dev;
struct ilo_blend_state *blend;
blend = MALLOC_STRUCT(ilo_blend_state);
@@ -331,7 +331,7 @@ static void *
ilo_create_sampler_state(struct pipe_context *pipe,
const struct pipe_sampler_state *state)
{
const struct ilo_dev_info *dev = ilo_context(pipe)->dev;
const struct ilo_dev *dev = ilo_context(pipe)->dev;
struct ilo_sampler_cso *sampler;
sampler = MALLOC_STRUCT(ilo_sampler_cso);
@@ -401,7 +401,7 @@ static void *
ilo_create_rasterizer_state(struct pipe_context *pipe,
const struct pipe_rasterizer_state *state)
{
const struct ilo_dev_info *dev = ilo_context(pipe)->dev;
const struct ilo_dev *dev = ilo_context(pipe)->dev;
struct ilo_rasterizer_state *rast;
rast = MALLOC_STRUCT(ilo_rasterizer_state);
@@ -433,7 +433,7 @@ static void *
ilo_create_depth_stencil_alpha_state(struct pipe_context *pipe,
const struct pipe_depth_stencil_alpha_state *state)
{
const struct ilo_dev_info *dev = ilo_context(pipe)->dev;
const struct ilo_dev *dev = ilo_context(pipe)->dev;
struct ilo_dsa_state *dsa;
dsa = MALLOC_STRUCT(ilo_dsa_state);
@@ -574,7 +574,7 @@ ilo_create_vertex_elements_state(struct pipe_context *pipe,
unsigned num_elements,
const struct pipe_vertex_element *elements)
{
const struct ilo_dev_info *dev = ilo_context(pipe)->dev;
const struct ilo_dev *dev = ilo_context(pipe)->dev;
struct ilo_ve_state *ve;
ve = MALLOC_STRUCT(ilo_ve_state);
@@ -660,7 +660,7 @@ ilo_set_constant_buffer(struct pipe_context *pipe,
uint shader, uint index,
struct pipe_constant_buffer *buf)
{
const struct ilo_dev_info *dev = ilo_context(pipe)->dev;
const struct ilo_dev *dev = ilo_context(pipe)->dev;
struct ilo_state_vector *vec = &ilo_context(pipe)->state_vector;
struct ilo_cbuf_state *cbuf = &vec->cbuf[shader];
const unsigned count = 1;
@@ -728,7 +728,7 @@ static void
ilo_set_framebuffer_state(struct pipe_context *pipe,
const struct pipe_framebuffer_state *state)
{
const struct ilo_dev_info *dev = ilo_context(pipe)->dev;
const struct ilo_dev *dev = ilo_context(pipe)->dev;
struct ilo_state_vector *vec = &ilo_context(pipe)->state_vector;
ilo_gpe_set_fb(dev, state, &vec->fb);
@@ -753,7 +753,7 @@ ilo_set_scissor_states(struct pipe_context *pipe,
unsigned num_scissors,
const struct pipe_scissor_state *scissors)
{
const struct ilo_dev_info *dev = ilo_context(pipe)->dev;
const struct ilo_dev *dev = ilo_context(pipe)->dev;
struct ilo_state_vector *vec = &ilo_context(pipe)->state_vector;
ilo_gpe_set_scissor(dev, start_slot, num_scissors,
@@ -768,7 +768,7 @@ ilo_set_viewport_states(struct pipe_context *pipe,
unsigned num_viewports,
const struct pipe_viewport_state *viewports)
{
const struct ilo_dev_info *dev = ilo_context(pipe)->dev;
const struct ilo_dev *dev = ilo_context(pipe)->dev;
struct ilo_state_vector *vec = &ilo_context(pipe)->state_vector;
if (viewports) {
@@ -988,7 +988,7 @@ ilo_create_sampler_view(struct pipe_context *pipe,
struct pipe_resource *res,
const struct pipe_sampler_view *templ)
{
const struct ilo_dev_info *dev = ilo_context(pipe)->dev;
const struct ilo_dev *dev = ilo_context(pipe)->dev;
struct ilo_view_cso *view;
view = MALLOC_STRUCT(ilo_view_cso);
@@ -1044,7 +1044,7 @@ ilo_create_surface(struct pipe_context *pipe,
struct pipe_resource *res,
const struct pipe_surface *templ)
{
const struct ilo_dev_info *dev = ilo_context(pipe)->dev;
const struct ilo_dev *dev = ilo_context(pipe)->dev;
struct ilo_surface_cso *surf;
surf = MALLOC_STRUCT(ilo_surface_cso);
@@ -1289,7 +1289,7 @@ ilo_init_state_functions(struct ilo_context *ilo)
}
void
ilo_state_vector_init(const struct ilo_dev_info *dev,
ilo_state_vector_init(const struct ilo_dev *dev,
struct ilo_state_vector *vec)
{
ilo_gpe_set_scissor_null(dev, &vec->scissor);
src/gallium/drivers/ilo/ilo_state.h
+1 -1
View File
@@ -453,7 +453,7 @@ void
ilo_finalize_compute_states(struct ilo_context *ilo);
void
ilo_state_vector_init(const struct ilo_dev_info *dev,
ilo_state_vector_init(const struct ilo_dev *dev,
struct ilo_state_vector *vec);
void
src/gallium/drivers/ilo/ilo_state_3d.h
+18 -18
View File
@@ -62,63 +62,63 @@ ilo_gpe_gen6_translate_texture(enum pipe_texture_target target)
}
void
ilo_gpe_init_ve(const struct ilo_dev_info *dev,
ilo_gpe_init_ve(const struct ilo_dev *dev,
unsigned num_states,
const struct pipe_vertex_element *states,
struct ilo_ve_state *ve);
void
ilo_gpe_set_ve_edgeflag(const struct ilo_dev_info *dev,
ilo_gpe_set_ve_edgeflag(const struct ilo_dev *dev,
struct ilo_ve_cso *cso);
void
ilo_gpe_init_ve_nosrc(const struct ilo_dev_info *dev,
ilo_gpe_init_ve_nosrc(const struct ilo_dev *dev,
int comp0, int comp1, int comp2, int comp3,
struct ilo_ve_cso *cso);
void
ilo_gpe_set_viewport_cso(const struct ilo_dev_info *dev,
ilo_gpe_set_viewport_cso(const struct ilo_dev *dev,
const struct pipe_viewport_state *state,
struct ilo_viewport_cso *vp);
void
ilo_gpe_set_scissor(const struct ilo_dev_info *dev,
ilo_gpe_set_scissor(const struct ilo_dev *dev,
unsigned start_slot,
unsigned num_states,
const struct pipe_scissor_state *states,
struct ilo_scissor_state *scissor);
void
ilo_gpe_set_scissor_null(const struct ilo_dev_info *dev,
ilo_gpe_set_scissor_null(const struct ilo_dev *dev,
struct ilo_scissor_state *scissor);
void
ilo_gpe_init_rasterizer(const struct ilo_dev_info *dev,
ilo_gpe_init_rasterizer(const struct ilo_dev *dev,
const struct pipe_rasterizer_state *state,
struct ilo_rasterizer_state *rasterizer);
void
ilo_gpe_init_dsa(const struct ilo_dev_info *dev,
ilo_gpe_init_dsa(const struct ilo_dev *dev,
const struct pipe_depth_stencil_alpha_state *state,
struct ilo_dsa_state *dsa);
void
ilo_gpe_init_blend(const struct ilo_dev_info *dev,
ilo_gpe_init_blend(const struct ilo_dev *dev,
const struct pipe_blend_state *state,
struct ilo_blend_state *blend);
void
ilo_gpe_init_sampler_cso(const struct ilo_dev_info *dev,
ilo_gpe_init_sampler_cso(const struct ilo_dev *dev,
const struct pipe_sampler_state *state,
struct ilo_sampler_cso *sampler);
void
ilo_gpe_init_view_surface_null(const struct ilo_dev_info *dev,
ilo_gpe_init_view_surface_null(const struct ilo_dev *dev,
unsigned width, unsigned height,
unsigned depth, unsigned level,
struct ilo_view_surface *surf);
void
ilo_gpe_init_view_surface_for_buffer(const struct ilo_dev_info *dev,
ilo_gpe_init_view_surface_for_buffer(const struct ilo_dev *dev,
const struct ilo_buffer *buf,
unsigned offset, unsigned size,
unsigned struct_size,
@@ -127,7 +127,7 @@ ilo_gpe_init_view_surface_for_buffer(const struct ilo_dev_info *dev,
struct ilo_view_surface *surf);
void
ilo_gpe_init_view_surface_for_texture(const struct ilo_dev_info *dev,
ilo_gpe_init_view_surface_for_texture(const struct ilo_dev *dev,
const struct ilo_texture *tex,
enum pipe_format format,
unsigned first_level,
@@ -138,29 +138,29 @@ ilo_gpe_init_view_surface_for_texture(const struct ilo_dev_info *dev,
struct ilo_view_surface *surf);
void
ilo_gpe_init_zs_surface(const struct ilo_dev_info *dev,
ilo_gpe_init_zs_surface(const struct ilo_dev *dev,
const struct ilo_texture *tex,
enum pipe_format format, unsigned level,
unsigned first_layer, unsigned num_layers,
struct ilo_zs_surface *zs);
void
ilo_gpe_init_vs_cso(const struct ilo_dev_info *dev,
ilo_gpe_init_vs_cso(const struct ilo_dev *dev,
const struct ilo_shader_state *vs,
struct ilo_shader_cso *cso);
void
ilo_gpe_init_gs_cso(const struct ilo_dev_info *dev,
ilo_gpe_init_gs_cso(const struct ilo_dev *dev,
const struct ilo_shader_state *gs,
struct ilo_shader_cso *cso);
void
ilo_gpe_init_fs_cso(const struct ilo_dev_info *dev,
ilo_gpe_init_fs_cso(const struct ilo_dev *dev,
const struct ilo_shader_state *fs,
struct ilo_shader_cso *cso);
void
ilo_gpe_set_fb(const struct ilo_dev_info *dev,
ilo_gpe_set_fb(const struct ilo_dev *dev,
const struct pipe_framebuffer_state *state,
struct ilo_fb_state *fb);
src/gallium/drivers/ilo/ilo_state_3d_bottom.c
+42 -42
View File
@@ -38,7 +38,7 @@
#include "ilo_state_3d.h"
static void
rasterizer_init_clip(const struct ilo_dev_info *dev,
rasterizer_init_clip(const struct ilo_dev *dev,
const struct pipe_rasterizer_state *state,
struct ilo_rasterizer_clip *clip)
{
@@ -128,7 +128,7 @@ rasterizer_init_clip(const struct ilo_dev_info *dev,
}
static void
rasterizer_init_sf_depth_offset_gen6(const struct ilo_dev_info *dev,
rasterizer_init_sf_depth_offset_gen6(const struct ilo_dev *dev,
const struct pipe_rasterizer_state *state,
struct ilo_rasterizer_sf *sf)
{
@@ -144,7 +144,7 @@ rasterizer_init_sf_depth_offset_gen6(const struct ilo_dev_info *dev,
}
static void
rasterizer_init_sf_gen6(const struct ilo_dev_info *dev,
rasterizer_init_sf_gen6(const struct ilo_dev *dev,
const struct pipe_rasterizer_state *state,
struct ilo_rasterizer_sf *sf)
{
@@ -333,7 +333,7 @@ rasterizer_init_sf_gen6(const struct ilo_dev_info *dev,
}
static uint32_t
rasterizer_get_sf_raster_gen8(const struct ilo_dev_info *dev,
rasterizer_get_sf_raster_gen8(const struct ilo_dev *dev,
const struct pipe_rasterizer_state *state)
{
uint32_t dw = 0;
@@ -408,7 +408,7 @@ rasterizer_get_sf_raster_gen8(const struct ilo_dev_info *dev,
}
static void
rasterizer_init_sf_gen8(const struct ilo_dev_info *dev,
rasterizer_init_sf_gen8(const struct ilo_dev *dev,
const struct pipe_rasterizer_state *state,
struct ilo_rasterizer_sf *sf)
{
@@ -471,7 +471,7 @@ rasterizer_init_sf_gen8(const struct ilo_dev_info *dev,
}
static void
rasterizer_init_wm_gen6(const struct ilo_dev_info *dev,
rasterizer_init_wm_gen6(const struct ilo_dev *dev,
const struct pipe_rasterizer_state *state,
struct ilo_rasterizer_wm *wm)
{
@@ -516,7 +516,7 @@ rasterizer_init_wm_gen6(const struct ilo_dev_info *dev,
}
static void
rasterizer_init_wm_gen7(const struct ilo_dev_info *dev,
rasterizer_init_wm_gen7(const struct ilo_dev *dev,
const struct pipe_rasterizer_state *state,
struct ilo_rasterizer_wm *wm)
{
@@ -560,7 +560,7 @@ rasterizer_init_wm_gen7(const struct ilo_dev_info *dev,
}
static uint32_t
rasterizer_get_wm_gen8(const struct ilo_dev_info *dev,
rasterizer_get_wm_gen8(const struct ilo_dev *dev,
const struct pipe_rasterizer_state *state)
{
uint32_t dw;
@@ -586,7 +586,7 @@ rasterizer_get_wm_gen8(const struct ilo_dev_info *dev,
}
void
ilo_gpe_init_rasterizer(const struct ilo_dev_info *dev,
ilo_gpe_init_rasterizer(const struct ilo_dev *dev,
const struct pipe_rasterizer_state *state,
struct ilo_rasterizer_state *rasterizer)
{
@@ -607,7 +607,7 @@ ilo_gpe_init_rasterizer(const struct ilo_dev_info *dev,
}
static void
fs_init_cso_gen6(const struct ilo_dev_info *dev,
fs_init_cso_gen6(const struct ilo_dev *dev,
const struct ilo_shader_state *fs,
struct ilo_shader_cso *cso)
{
@@ -704,7 +704,7 @@ fs_init_cso_gen6(const struct ilo_dev_info *dev,
}
static uint32_t
fs_get_wm_gen7(const struct ilo_dev_info *dev,
fs_get_wm_gen7(const struct ilo_dev *dev,
const struct ilo_shader_state *fs)
{
uint32_t dw;
@@ -766,7 +766,7 @@ fs_get_wm_gen7(const struct ilo_dev_info *dev,
}
static void
fs_init_cso_gen7(const struct ilo_dev_info *dev,
fs_init_cso_gen7(const struct ilo_dev *dev,
const struct ilo_shader_state *fs,
struct ilo_shader_cso *cso)
{
@@ -818,7 +818,7 @@ fs_init_cso_gen7(const struct ilo_dev_info *dev,
}
static uint32_t
fs_get_psx_gen8(const struct ilo_dev_info *dev,
fs_get_psx_gen8(const struct ilo_dev *dev,
const struct ilo_shader_state *fs)
{
uint32_t dw;
@@ -842,7 +842,7 @@ fs_get_psx_gen8(const struct ilo_dev_info *dev,
}
static uint32_t
fs_get_wm_gen8(const struct ilo_dev_info *dev,
fs_get_wm_gen8(const struct ilo_dev *dev,
const struct ilo_shader_state *fs)
{
ILO_DEV_ASSERT(dev, 8, 8);
@@ -853,7 +853,7 @@ fs_get_wm_gen8(const struct ilo_dev_info *dev,
}
static void
fs_init_cso_gen8(const struct ilo_dev_info *dev,
fs_init_cso_gen8(const struct ilo_dev *dev,
const struct ilo_shader_state *fs,
struct ilo_shader_cso *cso)
{
@@ -890,7 +890,7 @@ fs_init_cso_gen8(const struct ilo_dev_info *dev,
}
void
ilo_gpe_init_fs_cso(const struct ilo_dev_info *dev,
ilo_gpe_init_fs_cso(const struct ilo_dev *dev,
const struct ilo_shader_state *fs,
struct ilo_shader_cso *cso)
{
@@ -919,7 +919,7 @@ struct ilo_zs_surface_info {
};
static void
zs_init_info_null(const struct ilo_dev_info *dev,
zs_init_info_null(const struct ilo_dev *dev,
struct ilo_zs_surface_info *info)
{
ILO_DEV_ASSERT(dev, 6, 8);
@@ -935,7 +935,7 @@ zs_init_info_null(const struct ilo_dev_info *dev,
}
static void
zs_init_info(const struct ilo_dev_info *dev,
zs_init_info(const struct ilo_dev *dev,
const struct ilo_texture *tex,
enum pipe_format format, unsigned level,
unsigned first_layer, unsigned num_layers,
@@ -1100,7 +1100,7 @@ zs_init_info(const struct ilo_dev_info *dev,
}
void
ilo_gpe_init_zs_surface(const struct ilo_dev_info *dev,
ilo_gpe_init_zs_surface(const struct ilo_dev *dev,
const struct ilo_texture *tex,
enum pipe_format format, unsigned level,
unsigned first_layer, unsigned num_layers,
@@ -1297,7 +1297,7 @@ ilo_gpe_init_zs_surface(const struct ilo_dev_info *dev,
}
static void
viewport_get_guardband(const struct ilo_dev_info *dev,
viewport_get_guardband(const struct ilo_dev *dev,
int center_x, int center_y,
int *min_gbx, int *max_gbx,
int *min_gby, int *max_gby)
@@ -1356,7 +1356,7 @@ viewport_get_guardband(const struct ilo_dev_info *dev,
}
void
ilo_gpe_set_viewport_cso(const struct ilo_dev_info *dev,
ilo_gpe_set_viewport_cso(const struct ilo_dev *dev,
const struct pipe_viewport_state *state,
struct ilo_viewport_cso *vp)
{
@@ -1510,7 +1510,7 @@ gen6_blend_factor_dst_alpha_forced_one(int factor)
}
static uint32_t
blend_get_rt_blend_enable_gen6(const struct ilo_dev_info *dev,
blend_get_rt_blend_enable_gen6(const struct ilo_dev *dev,
const struct pipe_rt_blend_state *rt,
bool dst_alpha_forced_one)
{
@@ -1550,7 +1550,7 @@ blend_get_rt_blend_enable_gen6(const struct ilo_dev_info *dev,
}
static uint32_t
blend_get_rt_blend_enable_gen8(const struct ilo_dev_info *dev,
blend_get_rt_blend_enable_gen8(const struct ilo_dev *dev,
const struct pipe_rt_blend_state *rt,
bool dst_alpha_forced_one,
bool *independent_alpha)
@@ -1593,7 +1593,7 @@ blend_get_rt_blend_enable_gen8(const struct ilo_dev_info *dev,
}
static void
blend_init_cso_gen6(const struct ilo_dev_info *dev,
blend_init_cso_gen6(const struct ilo_dev *dev,
const struct pipe_blend_state *state,
struct ilo_blend_state *blend,
unsigned index)
@@ -1637,7 +1637,7 @@ blend_init_cso_gen6(const struct ilo_dev_info *dev,
}
static bool
blend_init_cso_gen8(const struct ilo_dev_info *dev,
blend_init_cso_gen8(const struct ilo_dev *dev,
const struct pipe_blend_state *state,
struct ilo_blend_state *blend,
unsigned index)
@@ -1680,7 +1680,7 @@ blend_init_cso_gen8(const struct ilo_dev_info *dev,
}
static uint32_t
blend_get_logicop_enable_gen6(const struct ilo_dev_info *dev,
blend_get_logicop_enable_gen6(const struct ilo_dev *dev,
const struct pipe_blend_state *state)
{
ILO_DEV_ASSERT(dev, 6, 7.5);
@@ -1693,7 +1693,7 @@ blend_get_logicop_enable_gen6(const struct ilo_dev_info *dev,
}
static uint32_t
blend_get_logicop_enable_gen8(const struct ilo_dev_info *dev,
blend_get_logicop_enable_gen8(const struct ilo_dev *dev,
const struct pipe_blend_state *state)
{
ILO_DEV_ASSERT(dev, 8, 8);
@@ -1706,7 +1706,7 @@ blend_get_logicop_enable_gen8(const struct ilo_dev_info *dev,
}
static uint32_t
blend_get_alpha_mod_gen6(const struct ilo_dev_info *dev,
blend_get_alpha_mod_gen6(const struct ilo_dev *dev,
const struct pipe_blend_state *state,
bool dual_blend)
{
@@ -1732,7 +1732,7 @@ blend_get_alpha_mod_gen6(const struct ilo_dev_info *dev,
}
static uint32_t
blend_get_alpha_mod_gen8(const struct ilo_dev_info *dev,
blend_get_alpha_mod_gen8(const struct ilo_dev *dev,
const struct pipe_blend_state *state,
bool dual_blend)
{
@@ -1752,7 +1752,7 @@ blend_get_alpha_mod_gen8(const struct ilo_dev_info *dev,
}
static uint32_t
blend_get_ps_blend_gen8(const struct ilo_dev_info *dev, uint32_t rt_dw0)
blend_get_ps_blend_gen8(const struct ilo_dev *dev, uint32_t rt_dw0)
{
int rgb_src, rgb_dst, a_src, a_dst;
uint32_t dw;
@@ -1780,7 +1780,7 @@ blend_get_ps_blend_gen8(const struct ilo_dev_info *dev, uint32_t rt_dw0)
}
void
ilo_gpe_init_blend(const struct ilo_dev_info *dev,
ilo_gpe_init_blend(const struct ilo_dev *dev,
const struct pipe_blend_state *state,
struct ilo_blend_state *blend)
{
@@ -1863,7 +1863,7 @@ gen6_translate_dsa_func(unsigned func)
}
static uint32_t
dsa_get_stencil_enable_gen6(const struct ilo_dev_info *dev,
dsa_get_stencil_enable_gen6(const struct ilo_dev *dev,
const struct pipe_stencil_state *stencil0,
const struct pipe_stencil_state *stencil1)
{
@@ -1910,7 +1910,7 @@ dsa_get_stencil_enable_gen6(const struct ilo_dev_info *dev,
}
static uint32_t
dsa_get_stencil_enable_gen8(const struct ilo_dev_info *dev,
dsa_get_stencil_enable_gen8(const struct ilo_dev *dev,
const struct pipe_stencil_state *stencil0,
const struct pipe_stencil_state *stencil1)
{
@@ -1943,7 +1943,7 @@ dsa_get_stencil_enable_gen8(const struct ilo_dev_info *dev,
}
static uint32_t
dsa_get_depth_enable_gen6(const struct ilo_dev_info *dev,
dsa_get_depth_enable_gen6(const struct ilo_dev *dev,
const struct pipe_depth_state *state)
{
uint32_t dw;
@@ -1977,7 +1977,7 @@ dsa_get_depth_enable_gen6(const struct ilo_dev_info *dev,
}
static uint32_t
dsa_get_depth_enable_gen8(const struct ilo_dev_info *dev,
dsa_get_depth_enable_gen8(const struct ilo_dev *dev,
const struct pipe_depth_state *state)
{
uint32_t dw;
@@ -1998,7 +1998,7 @@ dsa_get_depth_enable_gen8(const struct ilo_dev_info *dev,
}
static uint32_t
dsa_get_alpha_enable_gen6(const struct ilo_dev_info *dev,
dsa_get_alpha_enable_gen6(const struct ilo_dev *dev,
const struct pipe_alpha_state *state)
{
uint32_t dw;
@@ -2016,7 +2016,7 @@ dsa_get_alpha_enable_gen6(const struct ilo_dev_info *dev,
}
static uint32_t
dsa_get_alpha_enable_gen8(const struct ilo_dev_info *dev,
dsa_get_alpha_enable_gen8(const struct ilo_dev *dev,
const struct pipe_alpha_state *state)
{
uint32_t dw;
@@ -2034,7 +2034,7 @@ dsa_get_alpha_enable_gen8(const struct ilo_dev_info *dev,
}
void
ilo_gpe_init_dsa(const struct ilo_dev_info *dev,
ilo_gpe_init_dsa(const struct ilo_dev *dev,
const struct pipe_depth_stencil_alpha_state *state,
struct ilo_dsa_state *dsa)
{
@@ -2071,7 +2071,7 @@ ilo_gpe_init_dsa(const struct ilo_dev_info *dev,
}
void
ilo_gpe_set_scissor(const struct ilo_dev_info *dev,
ilo_gpe_set_scissor(const struct ilo_dev *dev,
unsigned start_slot,
unsigned num_states,
const struct pipe_scissor_state *states,
@@ -2109,7 +2109,7 @@ ilo_gpe_set_scissor(const struct ilo_dev_info *dev,
}
void
ilo_gpe_set_scissor_null(const struct ilo_dev_info *dev,
ilo_gpe_set_scissor_null(const struct ilo_dev *dev,
struct ilo_scissor_state *scissor)
{
unsigned i;
@@ -2121,7 +2121,7 @@ ilo_gpe_set_scissor_null(const struct ilo_dev_info *dev,
}
static void
fb_set_blend_caps(const struct ilo_dev_info *dev,
fb_set_blend_caps(const struct ilo_dev *dev,
enum pipe_format format,
struct ilo_fb_blend_caps *caps)
{
@@ -2184,7 +2184,7 @@ fb_set_blend_caps(const struct ilo_dev_info *dev,
}
void
ilo_gpe_set_fb(const struct ilo_dev_info *dev,
ilo_gpe_set_fb(const struct ilo_dev *dev,
const struct pipe_framebuffer_state *state,
struct ilo_fb_state *fb)
{
src/gallium/drivers/ilo/ilo_state_3d_top.c
+19 -19
View File
@@ -39,7 +39,7 @@
#include "ilo_state_3d.h"
static void
ve_init_cso(const struct ilo_dev_info *dev,
ve_init_cso(const struct ilo_dev *dev,
const struct pipe_vertex_element *state,
unsigned vb_index,
struct ilo_ve_cso *cso)
@@ -79,7 +79,7 @@ ve_init_cso(const struct ilo_dev_info *dev,
}
void
ilo_gpe_init_ve(const struct ilo_dev_info *dev,
ilo_gpe_init_ve(const struct ilo_dev *dev,
unsigned num_states,
const struct pipe_vertex_element *states,
struct ilo_ve_state *ve)
@@ -119,7 +119,7 @@ ilo_gpe_init_ve(const struct ilo_dev_info *dev,
}
void
ilo_gpe_set_ve_edgeflag(const struct ilo_dev_info *dev,
ilo_gpe_set_ve_edgeflag(const struct ilo_dev *dev,
struct ilo_ve_cso *cso)
{
int format;
@@ -176,7 +176,7 @@ ilo_gpe_set_ve_edgeflag(const struct ilo_dev_info *dev,
}
void
ilo_gpe_init_ve_nosrc(const struct ilo_dev_info *dev,
ilo_gpe_init_ve_nosrc(const struct ilo_dev *dev,
int comp0, int comp1, int comp2, int comp3,
struct ilo_ve_cso *cso)
{
@@ -198,7 +198,7 @@ ilo_gpe_init_ve_nosrc(const struct ilo_dev_info *dev,
}
void
ilo_gpe_init_vs_cso(const struct ilo_dev_info *dev,
ilo_gpe_init_vs_cso(const struct ilo_dev *dev,
const struct ilo_shader_state *vs,
struct ilo_shader_cso *cso)
{
@@ -251,7 +251,7 @@ ilo_gpe_init_vs_cso(const struct ilo_dev_info *dev,
}
static void
gs_init_cso_gen6(const struct ilo_dev_info *dev,
gs_init_cso_gen6(const struct ilo_dev *dev,
const struct ilo_shader_state *gs,
struct ilo_shader_cso *cso)
{
@@ -353,7 +353,7 @@ gs_init_cso_gen6(const struct ilo_dev_info *dev,
}
static void
gs_init_cso_gen7(const struct ilo_dev_info *dev,
gs_init_cso_gen7(const struct ilo_dev *dev,
const struct ilo_shader_state *gs,
struct ilo_shader_cso *cso)
{
@@ -400,7 +400,7 @@ gs_init_cso_gen7(const struct ilo_dev_info *dev,
}
void
ilo_gpe_init_gs_cso(const struct ilo_dev_info *dev,
ilo_gpe_init_gs_cso(const struct ilo_dev *dev,
const struct ilo_shader_state *gs,
struct ilo_shader_cso *cso)
{
@@ -411,7 +411,7 @@ ilo_gpe_init_gs_cso(const struct ilo_dev_info *dev,
}
static void
view_init_null_gen6(const struct ilo_dev_info *dev,
view_init_null_gen6(const struct ilo_dev *dev,
unsigned width, unsigned height,
unsigned depth, unsigned level,
struct ilo_view_surface *surf)
@@ -465,7 +465,7 @@ view_init_null_gen6(const struct ilo_dev_info *dev,
}
static void
view_init_for_buffer_gen6(const struct ilo_dev_info *dev,
view_init_for_buffer_gen6(const struct ilo_dev *dev,
const struct ilo_buffer *buf,
unsigned offset, unsigned size,
unsigned struct_size,
@@ -556,7 +556,7 @@ view_init_for_buffer_gen6(const struct ilo_dev_info *dev,
}
static void
view_init_for_texture_gen6(const struct ilo_dev_info *dev,
view_init_for_texture_gen6(const struct ilo_dev *dev,
const struct ilo_texture *tex,
enum pipe_format format,
unsigned first_level,
@@ -720,7 +720,7 @@ view_init_for_texture_gen6(const struct ilo_dev_info *dev,
}
static void
view_init_null_gen7(const struct ilo_dev_info *dev,
view_init_null_gen7(const struct ilo_dev *dev,
unsigned width, unsigned height,
unsigned depth, unsigned level,
struct ilo_view_surface *surf)
@@ -791,7 +791,7 @@ view_init_null_gen7(const struct ilo_dev_info *dev,
}
static void
view_init_for_buffer_gen7(const struct ilo_dev_info *dev,
view_init_for_buffer_gen7(const struct ilo_dev *dev,
const struct ilo_buffer *buf,
unsigned offset, unsigned size,
unsigned struct_size,
@@ -918,7 +918,7 @@ view_init_for_buffer_gen7(const struct ilo_dev_info *dev,
}
static void
view_init_for_texture_gen7(const struct ilo_dev_info *dev,
view_init_for_texture_gen7(const struct ilo_dev *dev,
const struct ilo_texture *tex,
enum pipe_format format,
unsigned first_level,
@@ -1185,7 +1185,7 @@ view_init_for_texture_gen7(const struct ilo_dev_info *dev,
}
void
ilo_gpe_init_view_surface_null(const struct ilo_dev_info *dev,
ilo_gpe_init_view_surface_null(const struct ilo_dev *dev,
unsigned width, unsigned height,
unsigned depth, unsigned level,
struct ilo_view_surface *surf)
@@ -1203,7 +1203,7 @@ ilo_gpe_init_view_surface_null(const struct ilo_dev_info *dev,
}
void
ilo_gpe_init_view_surface_for_buffer(const struct ilo_dev_info *dev,
ilo_gpe_init_view_surface_for_buffer(const struct ilo_dev *dev,
const struct ilo_buffer *buf,
unsigned offset, unsigned size,
unsigned struct_size,
@@ -1225,7 +1225,7 @@ ilo_gpe_init_view_surface_for_buffer(const struct ilo_dev_info *dev,
}
void
ilo_gpe_init_view_surface_for_texture(const struct ilo_dev_info *dev,
ilo_gpe_init_view_surface_for_texture(const struct ilo_dev *dev,
const struct ilo_texture *tex,
enum pipe_format format,
unsigned first_level,
@@ -1254,7 +1254,7 @@ ilo_gpe_init_view_surface_for_texture(const struct ilo_dev_info *dev,
}
static void
sampler_init_border_color_gen6(const struct ilo_dev_info *dev,
sampler_init_border_color_gen6(const struct ilo_dev *dev,
const union pipe_color_union *color,
uint32_t *dw, int num_dwords)
{
@@ -1403,7 +1403,7 @@ gen6_translate_shadow_func(unsigned func)
}
void
ilo_gpe_init_sampler_cso(const struct ilo_dev_info *dev,
ilo_gpe_init_sampler_cso(const struct ilo_dev *dev,
const struct pipe_sampler_state *state,
struct ilo_sampler_cso *sampler)
{
src/gallium/drivers/ilo/shader/ilo_shader_internal.h
+1 -1
View File
@@ -158,7 +158,7 @@ struct ilo_shader {
* Information about a shader state.
*/
struct ilo_shader_info {
const struct ilo_dev_info *dev;
const struct ilo_dev *dev;
int type;
const struct tgsi_token *tokens;
src/gallium/drivers/ilo/shader/toy_compiler.c
+1 -1
View File
@@ -535,7 +535,7 @@ tc_init_inst_templ(struct toy_compiler *tc)
* Initialize the toy compiler.
*/
void
toy_compiler_init(struct toy_compiler *tc, const struct ilo_dev_info *dev)
toy_compiler_init(struct toy_compiler *tc, const struct ilo_dev *dev)
{
memset(tc, 0, sizeof(*tc));
src/gallium/drivers/ilo/shader/toy_compiler.h
+4 -4
View File
@@ -150,7 +150,7 @@ struct toy_compaction_table {
* Toy compiler.
*/
struct toy_compiler {
const struct ilo_dev_info *dev;
const struct ilo_dev *dev;
struct toy_inst templ;
struct util_slab_mempool mempool;
@@ -468,7 +468,7 @@ tc_fail(struct toy_compiler *tc, const char *reason)
}
void
toy_compiler_init(struct toy_compiler *tc, const struct ilo_dev_info *dev);
toy_compiler_init(struct toy_compiler *tc, const struct ilo_dev *dev);
void
toy_compiler_cleanup(struct toy_compiler *tc);
@@ -480,10 +480,10 @@ void *
toy_compiler_assemble(struct toy_compiler *tc, int *size);
const struct toy_compaction_table *
toy_compiler_get_compaction_table(const struct ilo_dev_info *dev);
toy_compiler_get_compaction_table(const struct ilo_dev *dev);
void
toy_compiler_disassemble(const struct ilo_dev_info *dev,
toy_compiler_disassemble(const struct ilo_dev *dev,
const void *kernel, int size,
bool dump_hex);
src/gallium/drivers/ilo/shader/toy_compiler_asm.c
+3 -3
View File
@@ -31,7 +31,7 @@
#define CG_REG_NUM(origin) ((origin) >> CG_REG_SHIFT)
struct codegen {
const struct ilo_dev_info *dev;
const struct ilo_dev *dev;
const struct toy_inst *inst;
int pc;
@@ -402,7 +402,7 @@ static const struct toy_compaction_table toy_compaction_table_gen8 = {
};
const struct toy_compaction_table *
toy_compiler_get_compaction_table(const struct ilo_dev_info *dev)
toy_compiler_get_compaction_table(const struct ilo_dev *dev)
{
switch (ilo_dev_gen(dev)) {
case ILO_GEN(8):
@@ -1028,7 +1028,7 @@ translate_swizzle(enum toy_swizzle swizzle)
* Prepare for generating an instruction.
*/
static void
codegen_prepare(struct codegen *cg, const struct ilo_dev_info *dev,
codegen_prepare(struct codegen *cg, const struct ilo_dev *dev,
const struct toy_inst *inst, int pc, int rect_linear_width)
{
int i;
src/gallium/drivers/ilo/shader/toy_compiler_disasm.c
+4 -4
View File
@@ -70,7 +70,7 @@ struct disasm_src_operand {
};
struct disasm_inst {
const struct ilo_dev_info *dev;
const struct ilo_dev *dev;
unsigned has_jip:1;
unsigned has_uip:1;
@@ -1936,7 +1936,7 @@ disasm_printer_print_inst(struct disasm_printer *printer,
}
static void
disasm_uncompact_3src(const struct ilo_dev_info *dev,
disasm_uncompact_3src(const struct ilo_dev *dev,
uint64_t compact, uint32_t *dw)
{
const struct toy_compaction_table *tbl =
@@ -2014,7 +2014,7 @@ disasm_uncompact_3src(const struct ilo_dev_info *dev,
}
static void
disasm_uncompact(const struct ilo_dev_info *dev,
disasm_uncompact(const struct ilo_dev *dev,
uint64_t compact, uint32_t *dw)
{
const struct toy_compaction_table *tbl =
@@ -2109,7 +2109,7 @@ disasm_uncompact(const struct ilo_dev_info *dev,
}
void
toy_compiler_disassemble(const struct ilo_dev_info *dev,
toy_compiler_disassemble(const struct ilo_dev *dev,
const void *kernel, int size,
bool dump_hex)
{