From: Francisco Jerez Date: Wed, 6 Jul 2016 06:15:01 +0000 (-0700) Subject: mesa: Rename "texturebarrier" source files to "barrier". X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=83d2f9db2929781d7d4b182355c872a7cbbcaeec;p=mesa.git mesa: Rename "texturebarrier" source files to "barrier". In preparation for collecting all pipeline barrier GL entry points into a single source file. Reviewed-by: Kenneth Graunke --- diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py index 72d7b6fea1f..85e79900988 100644 --- a/src/mapi/glapi/gen/gl_genexec.py +++ b/src/mapi/glapi/gen/gl_genexec.py @@ -111,7 +111,7 @@ header = """/** #include "main/texparam.h" #include "main/texstate.h" #include "main/texstorage.h" -#include "main/texturebarrier.h" +#include "main/barrier.h" #include "main/textureview.h" #include "main/transformfeedback.h" #include "main/mtypes.h" diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index 472e767d844..36227603652 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -24,6 +24,8 @@ MAIN_FILES = \ main/atifragshader.h \ main/attrib.c \ main/attrib.h \ + main/barrier.c \ + main/barrier.h \ main/blend.c \ main/blend.h \ main/blit.c \ @@ -230,8 +232,6 @@ MAIN_FILES = \ main/texstore.h \ main/textureview.c \ main/textureview.h \ - main/texturebarrier.c \ - main/texturebarrier.h \ main/transformfeedback.c \ main/transformfeedback.h \ main/uniform_query.cpp \ diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index 2730b7b2f2a..6069138e35d 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -47,7 +47,7 @@ #include "main/fbobject.h" #include "main/samplerobj.h" #include "main/syncobj.h" -#include "main/texturebarrier.h" +#include "main/barrier.h" #include "main/transformfeedback.h" #include "program/program.h" @@ -179,7 +179,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver) driver->BlitFramebuffer = _swrast_BlitFramebuffer; driver->DiscardFramebuffer = NULL; - _mesa_init_texture_barrier_functions(driver); + _mesa_init_barrier_functions(driver); _mesa_init_shader_object_functions(driver); _mesa_init_transform_feedback_functions(driver); _mesa_init_sampler_object_functions(driver); diff --git a/src/mesa/main/barrier.c b/src/mesa/main/barrier.c new file mode 100644 index 00000000000..beb48fb77b5 --- /dev/null +++ b/src/mesa/main/barrier.c @@ -0,0 +1,59 @@ +/* + * Copyright © 2011 Marek Olšák + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * 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 NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS 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. + */ + +/** + * \file barrier.c + * Implementation of various pipeline barrier entry points. + * + * \author Marek Olšák + */ + +#include "context.h" +#include "barrier.h" + + +static void +_mesa_texture_barrier(struct gl_context *ctx) +{ + /* no-op */ +} + +void +_mesa_init_barrier_functions(struct dd_function_table *driver) +{ + driver->TextureBarrier = _mesa_texture_barrier; +} + +void GLAPIENTRY +_mesa_TextureBarrierNV(void) +{ + GET_CURRENT_CONTEXT(ctx); + + if (!ctx->Extensions.NV_texture_barrier) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glTextureBarrier(not supported)"); + return; + } + + ctx->Driver.TextureBarrier(ctx); +} diff --git a/src/mesa/main/barrier.h b/src/mesa/main/barrier.h new file mode 100644 index 00000000000..0652d14f3f0 --- /dev/null +++ b/src/mesa/main/barrier.h @@ -0,0 +1,44 @@ +/* + * Copyright © 2011 Marek Olšák + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * 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 NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS 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. + */ + +/** + * \file barrier.h + * GL_NV_texture_barrier and friends. + * + * \author Marek Olšák + */ + +#ifndef BARRIER_H +#define BARRIER_H + +#include "glheader.h" + +struct dd_function_table; + +extern void +_mesa_init_barrier_functions(struct dd_function_table *driver); + +extern void GLAPIENTRY +_mesa_TextureBarrierNV(void); + +#endif /* BARRIER_H */ diff --git a/src/mesa/main/texturebarrier.c b/src/mesa/main/texturebarrier.c deleted file mode 100644 index d879eed57f2..00000000000 --- a/src/mesa/main/texturebarrier.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright © 2011 Marek Olšák - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * 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 NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS 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. - */ - -/** - * \file texturebarrier.c - * Implementation of glTextureBarrierNV. - * - * \author Marek Olšák - */ - -#include "context.h" -#include "texturebarrier.h" - - -static void -_mesa_texture_barrier(struct gl_context *ctx) -{ - /* no-op */ -} - -void -_mesa_init_texture_barrier_functions(struct dd_function_table *driver) -{ - driver->TextureBarrier = _mesa_texture_barrier; -} - -void GLAPIENTRY -_mesa_TextureBarrierNV(void) -{ - GET_CURRENT_CONTEXT(ctx); - - if (!ctx->Extensions.NV_texture_barrier) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "glTextureBarrier(not supported)"); - return; - } - - ctx->Driver.TextureBarrier(ctx); -} diff --git a/src/mesa/main/texturebarrier.h b/src/mesa/main/texturebarrier.h deleted file mode 100644 index a84a85b2176..00000000000 --- a/src/mesa/main/texturebarrier.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright © 2011 Marek Olšák - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * 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 NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS 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. - */ - -/** - * \file texturebarrier.h - * GL_NV_texture_barrier - * - * \author Marek Olšák - */ - -#ifndef TEXTUREBARRIER_H -#define TEXTUREBARRIER_H - -#include "glheader.h" - -struct dd_function_table; - -extern void -_mesa_init_texture_barrier_functions(struct dd_function_table *driver); - -extern void GLAPIENTRY -_mesa_TextureBarrierNV(void); - -#endif /* TEXTUREBARRIER_H */