diff --git a/src/gallium/auxiliary/vl/vl_deint_filter.c b/src/gallium/auxiliary/vl/vl_deint_filter.c index 654b97f1449..ef1d4c02ef8 100644 --- a/src/gallium/auxiliary/vl/vl_deint_filter.c +++ b/src/gallium/auxiliary/vl/vl_deint_filter.c @@ -280,7 +280,7 @@ vl_deint_filter_init(struct vl_deint_filter *filter, struct pipe_context *pipe, pipe->screen, PIPE_VIDEO_PROFILE_UNKNOWN, PIPE_VIDEO_ENTRYPOINT_PROCESSING, - PIPE_VIDEO_CAP_PREFERED_FORMAT + PIPE_VIDEO_CAP_PREFERRED_FORMAT ); templ.width = video_width; templ.height = video_height; diff --git a/src/gallium/drivers/d3d12/d3d12_video_screen.cpp b/src/gallium/drivers/d3d12/d3d12_video_screen.cpp index 6fc8d253f75..cc223d4e7ee 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_screen.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_screen.cpp @@ -1561,7 +1561,7 @@ d3d12_screen_get_video_param_decode(struct pipe_screen *pscreen, } return 0; } break; - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return (profile == PIPE_VIDEO_PROFILE_UNKNOWN) ? PIPE_FORMAT_NV12 : d3d12_get_pipe_format(d3d12_convert_pipe_video_profile_to_dxgi_format(profile)); case PIPE_VIDEO_CAP_PREFERS_INTERLACED: return false; @@ -1666,7 +1666,7 @@ d3d12_screen_get_video_param_postproc(struct pipe_screen *pscreen, case PIPE_VIDEO_CAP_MIN_WIDTH: case PIPE_VIDEO_CAP_MIN_HEIGHT: case PIPE_VIDEO_CAP_SUPPORTED: - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED: case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: case PIPE_VIDEO_CAP_SUPPORTS_CONTIGUOUS_PLANES_MAP: @@ -1708,7 +1708,7 @@ d3d12_screen_get_video_param_postproc(struct pipe_screen *pscreen, if (d3d12_has_video_process_support(pscreen, supportCaps, minSupportedInput, maxSupportedInput)) { if (param == PIPE_VIDEO_CAP_SUPPORTED) { return true; - } else if (param == PIPE_VIDEO_CAP_PREFERED_FORMAT) { + } else if (param == PIPE_VIDEO_CAP_PREFERRED_FORMAT) { return PIPE_FORMAT_NV12; } else if (param == PIPE_VIDEO_CAP_SUPPORTS_INTERLACED) { return false; @@ -1954,7 +1954,7 @@ d3d12_screen_get_video_param_encode(struct pipe_screen *pscreen, } return 0; } break; - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return (profile == PIPE_VIDEO_PROFILE_UNKNOWN) ? PIPE_FORMAT_NV12 : d3d12_get_pipe_format(d3d12_convert_pipe_video_profile_to_dxgi_format(profile)); case PIPE_VIDEO_CAP_PREFERS_INTERLACED: return false; diff --git a/src/gallium/drivers/lima/lima_job.c b/src/gallium/drivers/lima/lima_job.c index 78743bc35f0..1c8d42c87e1 100644 --- a/src/gallium/drivers/lima/lima_job.c +++ b/src/gallium/drivers/lima/lima_job.c @@ -464,7 +464,7 @@ lima_get_pp_stream_size(int num_pp, int tiled_w, int tiled_h, uint32_t *off) /* carefully calculate each stream start address: * 1. overflow: each stream size may be different due to * fb->tiled_w * fb->tiled_h can't be divided by num_pp, - * extra size should be added to the preceeding stream + * extra size should be added to the preceding stream * 2. alignment: each stream address should be 0x20 aligned */ int delta = tiled_w * tiled_h / num_pp * 16 + 16; diff --git a/src/gallium/drivers/nouveau/nouveau_video.c b/src/gallium/drivers/nouveau/nouveau_video.c index a7de4bf0bcd..077b5b53417 100644 --- a/src/gallium/drivers/nouveau/nouveau_video.c +++ b/src/gallium/drivers/nouveau/nouveau_video.c @@ -856,7 +856,7 @@ nouveau_screen_get_video_param(struct pipe_screen *pscreen, case PIPE_VIDEO_CAP_MAX_WIDTH: case PIPE_VIDEO_CAP_MAX_HEIGHT: return vl_video_buffer_max_size(pscreen); - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return PIPE_FORMAT_NV12; case PIPE_VIDEO_CAP_PREFERS_INTERLACED: return false; diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video.c b/src/gallium/drivers/nouveau/nouveau_vp3_video.c index 5da65ce22dc..5be369357cd 100644 --- a/src/gallium/drivers/nouveau/nouveau_vp3_video.c +++ b/src/gallium/drivers/nouveau/nouveau_vp3_video.c @@ -509,7 +509,7 @@ nouveau_vp3_screen_get_video_param(struct pipe_screen *pscreen, debug_printf("unknown video codec: %d\n", codec); return 0; } - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return PIPE_FORMAT_NV12; case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED: case PIPE_VIDEO_CAP_PREFERS_INTERLACED: diff --git a/src/gallium/drivers/nouveau/nv50/nv84_video.c b/src/gallium/drivers/nouveau/nv50/nv84_video.c index 04bee83e01d..840fc5df039 100644 --- a/src/gallium/drivers/nouveau/nv50/nv84_video.c +++ b/src/gallium/drivers/nouveau/nv50/nv84_video.c @@ -833,7 +833,7 @@ nv84_screen_get_video_param(struct pipe_screen *pscreen, case PIPE_VIDEO_CAP_MAX_WIDTH: case PIPE_VIDEO_CAP_MAX_HEIGHT: return 2048; - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return PIPE_FORMAT_NV12; case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED: case PIPE_VIDEO_CAP_PREFERS_INTERLACED: diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index 51eb7aa48cd..6a2605d9e22 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -118,7 +118,7 @@ static int r300_get_video_param(struct pipe_screen *screen, case PIPE_VIDEO_CAP_MAX_WIDTH: case PIPE_VIDEO_CAP_MAX_HEIGHT: return vl_video_buffer_max_size(screen); - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return PIPE_FORMAT_NV12; case PIPE_VIDEO_CAP_PREFERS_INTERLACED: return false; diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c index 8b34cc8c1c6..7c48a6c5a05 100644 --- a/src/gallium/drivers/r600/r600_pipe_common.c +++ b/src/gallium/drivers/r600/r600_pipe_common.c @@ -786,7 +786,7 @@ static int r600_get_video_param(struct pipe_screen *screen, case PIPE_VIDEO_CAP_MAX_WIDTH: case PIPE_VIDEO_CAP_MAX_HEIGHT: return vl_video_buffer_max_size(screen); - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return PIPE_FORMAT_NV12; case PIPE_VIDEO_CAP_PREFERS_INTERLACED: return false; diff --git a/src/gallium/drivers/r600/radeon_video.c b/src/gallium/drivers/r600/radeon_video.c index 670e0aafb9e..0502c50b48d 100644 --- a/src/gallium/drivers/r600/radeon_video.c +++ b/src/gallium/drivers/r600/radeon_video.c @@ -211,7 +211,7 @@ int rvid_get_video_param(struct pipe_screen *screen, return 2048; case PIPE_VIDEO_CAP_MAX_HEIGHT: return 1152; - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return PIPE_FORMAT_NV12; case PIPE_VIDEO_CAP_PREFERS_INTERLACED: return false; @@ -251,7 +251,7 @@ int rvid_get_video_param(struct pipe_screen *screen, return 2048; case PIPE_VIDEO_CAP_MAX_HEIGHT: return 1152; - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return PIPE_FORMAT_NV12; case PIPE_VIDEO_CAP_PREFERS_INTERLACED: diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index 3fcde3e6949..2c404a6990e 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -96,7 +96,7 @@ static int si_get_video_param_no_video_hw(struct pipe_screen *screen, enum pipe_ case PIPE_VIDEO_CAP_MAX_WIDTH: case PIPE_VIDEO_CAP_MAX_HEIGHT: return vl_video_buffer_max_size(screen); - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return PIPE_FORMAT_NV12; case PIPE_VIDEO_CAP_PREFERS_INTERLACED: return false; @@ -161,7 +161,7 @@ static int si_get_video_param(struct pipe_screen *screen, enum pipe_video_profil * Have to determine the version and features of VPE in future. */ return PIPE_VIDEO_VPP_BLEND_MODE_NONE; - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return PIPE_FORMAT_NV12; case PIPE_VIDEO_CAP_PREFERS_INTERLACED: return false; @@ -227,7 +227,7 @@ static int si_get_video_param(struct pipe_screen *screen, enum pipe_video_profil return KERNEL_ENC_CAP(codec, max_height); else return (sscreen->info.family < CHIP_TONGA) ? 1152 : 2304; - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: if (profile == PIPE_VIDEO_PROFILE_HEVC_MAIN_10) return PIPE_FORMAT_P010; else @@ -530,7 +530,7 @@ static int si_get_video_param(struct pipe_screen *screen, enum pipe_video_profil return (sscreen->info.family < CHIP_TONGA) ? 1152 : 4096; } } - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: if (profile == PIPE_VIDEO_PROFILE_HEVC_MAIN_10) return PIPE_FORMAT_P010; else if (profile == PIPE_VIDEO_PROFILE_VP9_PROFILE2) diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm.c b/src/gallium/drivers/radeonsi/si_shader_llvm.c index 4e18188e478..75b2fb049c3 100644 --- a/src/gallium/drivers/radeonsi/si_shader_llvm.c +++ b/src/gallium/drivers/radeonsi/si_shader_llvm.c @@ -456,7 +456,7 @@ static void si_build_wrapper_function(struct si_shader_context *ctx, * block. */ - /* Second part params are same as the preceeding params of the first part. */ + /* Second part params are same as the preceding params of the first part. */ num_params = LLVMCountParams(parts[1].value); } diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c index e3a565a5934..6bc7767d78e 100644 --- a/src/gallium/drivers/virgl/virgl_screen.c +++ b/src/gallium/drivers/virgl/virgl_screen.c @@ -145,7 +145,7 @@ virgl_get_video_param(struct pipe_screen *screen, return vcaps ? vcaps->max_width : 0; case PIPE_VIDEO_CAP_MAX_HEIGHT: return vcaps ? vcaps->max_height : 0; - case PIPE_VIDEO_CAP_PREFERED_FORMAT: + case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return vcaps ? virgl_to_pipe_format(vcaps->prefered_format) : PIPE_FORMAT_NV12; case PIPE_VIDEO_CAP_PREFERS_INTERLACED: return vcaps ? vcaps->prefers_interlaced : false; diff --git a/src/gallium/frontends/vdpau/decode.c b/src/gallium/frontends/vdpau/decode.c index dab27c04833..08c3754e12a 100644 --- a/src/gallium/frontends/vdpau/decode.c +++ b/src/gallium/frontends/vdpau/decode.c @@ -1112,9 +1112,9 @@ vlVdpDecoderRender(VdpDecoder decoder, if (vlsurf->video_buffer) vlsurf->video_buffer->destroy(vlsurf->video_buffer); - /* set the buffer format to the prefered one */ + /* set the buffer format to the preferred one */ vlsurf->templat.buffer_format = screen->get_video_param(screen, dec->profile, PIPE_VIDEO_ENTRYPOINT_BITSTREAM, - PIPE_VIDEO_CAP_PREFERED_FORMAT); + PIPE_VIDEO_CAP_PREFERRED_FORMAT); /* also set interlacing to decoders preferences */ vlsurf->templat.interlaced = screen->get_video_param(screen, dec->profile, PIPE_VIDEO_ENTRYPOINT_BITSTREAM, diff --git a/src/gallium/frontends/vdpau/surface.c b/src/gallium/frontends/vdpau/surface.c index 46747f437e4..ac9a2e2cfcd 100644 --- a/src/gallium/frontends/vdpau/surface.c +++ b/src/gallium/frontends/vdpau/surface.c @@ -331,7 +331,7 @@ vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface, nformat = screen->get_video_param(screen, PIPE_VIDEO_PROFILE_UNKNOWN, PIPE_VIDEO_ENTRYPOINT_BITSTREAM, - PIPE_VIDEO_CAP_PREFERED_FORMAT); + PIPE_VIDEO_CAP_PREFERRED_FORMAT); if (nformat == PIPE_FORMAT_NONE) { mtx_unlock(&p_surf->device->mutex); return VDP_STATUS_NO_IMPLEMENTATION; diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index 05cf2e06dcf..7dde135b526 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -946,7 +946,7 @@ struct pipe_blit_info struct pipe_grid_info { /** - * For drivers that use PIPE_SHADER_IR_NATIVE as their prefered IR, this + * For drivers that use PIPE_SHADER_IR_NATIVE as their preferred IR, this * value will be the index of the kernel in the opencl.kernels metadata * list. */ diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h index 4743f4645a7..1bc04d8d464 100644 --- a/src/gallium/include/pipe/p_video_enums.h +++ b/src/gallium/include/pipe/p_video_enums.h @@ -87,7 +87,7 @@ enum pipe_video_cap PIPE_VIDEO_CAP_NPOT_TEXTURES = 1, PIPE_VIDEO_CAP_MAX_WIDTH = 2, PIPE_VIDEO_CAP_MAX_HEIGHT = 3, - PIPE_VIDEO_CAP_PREFERED_FORMAT = 4, + PIPE_VIDEO_CAP_PREFERRED_FORMAT = 4, PIPE_VIDEO_CAP_PREFERS_INTERLACED = 5, PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE = 6, PIPE_VIDEO_CAP_SUPPORTS_INTERLACED = 7, diff --git a/src/gallium/targets/libgl-gdi/tests/wgl_tests.cpp b/src/gallium/targets/libgl-gdi/tests/wgl_tests.cpp index f3b011b83ac..3250e48da33 100644 --- a/src/gallium/targets/libgl-gdi/tests/wgl_tests.cpp +++ b/src/gallium/targets/libgl-gdi/tests/wgl_tests.cpp @@ -80,7 +80,7 @@ window::window(uint32_t width, uint32_t height) PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER, /* support double-buffering */ PFD_TYPE_RGBA, /* color type */ - 32, /* prefered color depth */ + 32, /* preferred color depth */ 0, 0, 0, 0, 0, 0, /* color bits (ignored) */ 0, /* no alpha buffer */ 0, /* alpha bits (ignored) */