si_state_viewport.c maybe? Marek
On Fri, Sep 29, 2017 at 1:01 PM, Nicolai Hähnle <nhaeh...@gmail.com> wrote: > From: Nicolai Hähnle <nicolai.haeh...@amd.com> > > This is purely a file-move + #include fixup + build system changes. > Other cleanups will follow in subsequent commits. > --- > src/gallium/drivers/radeon/Makefile.sources | 1 - > src/gallium/drivers/radeonsi/Makefile.sources | 3 > ++- > src/gallium/drivers/{radeon/r600_viewport.c => radeonsi/si_viewport.c} | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > rename src/gallium/drivers/{radeon/r600_viewport.c => > radeonsi/si_viewport.c} (99%) > > diff --git a/src/gallium/drivers/radeon/Makefile.sources > b/src/gallium/drivers/radeon/Makefile.sources > index f4e817e56ef..5d38bb36b44 100644 > --- a/src/gallium/drivers/radeon/Makefile.sources > +++ b/src/gallium/drivers/radeon/Makefile.sources > @@ -4,21 +4,20 @@ C_SOURCES := \ > r600_cs.h \ > r600_gpu_load.c \ > r600_perfcounter.c \ > r600_pipe_common.c \ > r600_pipe_common.h \ > r600_query.c \ > r600_query.h \ > r600_streamout.c \ > r600_test_dma.c \ > r600_texture.c \ > - r600_viewport.c \ > radeon_uvd.c \ > radeon_uvd.h \ > radeon_vcn_dec.c \ > radeon_vcn_dec.h \ > radeon_vce_40_2_2.c \ > radeon_vce_50.c \ > radeon_vce_52.c \ > radeon_vce.c \ > radeon_vce.h \ > radeon_video.c \ > diff --git a/src/gallium/drivers/radeonsi/Makefile.sources > b/src/gallium/drivers/radeonsi/Makefile.sources > index 3795bedb6bb..dfcaa9b9383 100644 > --- a/src/gallium/drivers/radeonsi/Makefile.sources > +++ b/src/gallium/drivers/radeonsi/Makefile.sources > @@ -24,11 +24,12 @@ C_SOURCES := \ > si_shader_internal.h \ > si_shader_nir.c \ > si_shader_tgsi_alu.c \ > si_shader_tgsi_mem.c \ > si_shader_tgsi_setup.c \ > si_state.c \ > si_state_binning.c \ > si_state_draw.c \ > si_state_shaders.c \ > si_state.h \ > - si_uvd.c > + si_uvd.c \ > + si_viewport.c > diff --git a/src/gallium/drivers/radeon/r600_viewport.c > b/src/gallium/drivers/radeonsi/si_viewport.c > similarity index 99% > rename from src/gallium/drivers/radeon/r600_viewport.c > rename to src/gallium/drivers/radeonsi/si_viewport.c > index 6e4fc9d751c..00fa4c0d026 100644 > --- a/src/gallium/drivers/radeon/r600_viewport.c > +++ b/src/gallium/drivers/radeonsi/si_viewport.c > @@ -14,21 +14,21 @@ > * > * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL > * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, > * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR > * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE > * USE OR OTHER DEALINGS IN THE SOFTWARE. > */ > > -#include "r600_cs.h" > +#include "radeon/r600_cs.h" > #include "util/u_viewport.h" > #include "tgsi/tgsi_scan.h" > > #define GET_MAX_SCISSOR(rctx) (rctx->chip_class >= EVERGREEN ? 16384 : 8192) > > static void r600_set_scissor_states(struct pipe_context *ctx, > unsigned start_slot, > unsigned num_scissors, > const struct pipe_scissor_state *state) > { > -- > 2.11.0 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev