OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: add NV_texture_barrier

Browse Source
This commit is contained in:
Marek Olšák
2011-03-08 11:29:20 +01:00
parent 65942e141f
commit 867f9b07d4
12 changed files with 130 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mapi/glapi/gen/Makefile
View File

@@ -98,6 +98,7 @@ API_XML = \
EXT_transform_feedback.xml \
NV_conditional_render.xml \
NV_primitive_restart.xml \
NV_texture_barrier.xml \
OES_EGL_image.xml \
GL3x.xml

13
src/mapi/glapi/gen/NV_texture_barrier.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0"?>
<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
<!-- Note: no GLX protocol info yet. -->
<OpenGLAPI>
<category name="GL_NV_texture_barrier" number="381">
<function name="TextureBarrierNV" offset="assign" />
</category>
</OpenGLAPI>

2
src/mapi/glapi/gen/gl_API.xml
View File

@@ -7971,6 +7971,8 @@
<xi:include href="NV_primitive_restart.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="NV_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="ARB_draw_instanced.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

1
src/mesa/SConscript
View File

@@ -123,6 +123,7 @@ main_sources = [
'main/texrender.c',
'main/texstate.c',
'main/texstore.c',
'main/texturebarrier.c'
'main/transformfeedback.c',
'main/uniforms.c',
'main/varray.c',

3
src/mesa/drivers/common/driverfuncs.c
View File

@@ -42,6 +42,7 @@
#include "main/fbobject.h"
#include "main/texrender.h"
#include "main/syncobj.h"
#include "main/texturebarrier.h"
#include "main/transformfeedback.h"
#include "program/program.h"
@@ -188,6 +189,8 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
driver->BlitFramebuffer = _swrast_BlitFramebuffer;
_mesa_init_texture_barrier_functions(driver);
/* APPLE_vertex_array_object */
driver->NewArrayObject = _mesa_new_array_object;
driver->DeleteArrayObject = _mesa_delete_array_object;

4
src/mesa/main/api_exec.c
View File

@@ -87,6 +87,7 @@
#include "texobj.h"
#include "texparam.h"
#include "texstate.h"
#include "texturebarrier.h"
#include "transformfeedback.h"
#include "mtypes.h"
#include "varray.h"
@@ -720,6 +721,9 @@ _mesa_create_exec_table(void)
SET_BlendEquationiARB(exec, _mesa_BlendEquationi);
SET_BlendEquationSeparateiARB(exec, _mesa_BlendEquationSeparatei);
/* GL_NV_texture_barrier */
SET_TextureBarrierNV(exec, _mesa_TextureBarrierNV);
return exec;
}

5
src/mesa/main/dd.h
View File

@@ -1025,6 +1025,11 @@ struct dd_function_table {
struct gl_transform_feedback_object *obj);
void (*DrawTransformFeedback)(struct gl_context *ctx, GLenum mode,
struct gl_transform_feedback_object *obj);
/**
* \name GL_NV_texture_barrier interface
*/
void (*TextureBarrier)(struct gl_context *ctx);
};

1
src/mesa/main/extensions.c
View File

@@ -283,6 +283,7 @@ static const struct extension extension_table[] = {
{ "GL_NV_point_sprite", o(NV_point_sprite), GL },
{ "GL_NV_primitive_restart", o(NV_primitive_restart), GL },
{ "GL_NV_texgen_reflection", o(NV_texgen_reflection), GL },
{ "GL_NV_texture_barrier", o(NV_texture_barrier), GL },
{ "GL_NV_texture_env_combine4", o(NV_texture_env_combine4), GL },
{ "GL_NV_texture_rectangle", o(NV_texture_rectangle), GL },
{ "GL_NV_vertex_program1_1", o(NV_vertex_program1_1), GL },

1
src/mesa/main/mtypes.h
View File

@@ -2848,6 +2848,7 @@ struct gl_extensions
GLboolean NV_light_max_exponent;
GLboolean NV_point_sprite;
GLboolean NV_primitive_restart;
GLboolean NV_texture_barrier;
GLboolean NV_texgen_reflection;
GLboolean NV_texture_env_combine4;
GLboolean NV_texture_rectangle;

54
src/mesa/main/texturebarrier.c Normal file
View File

@@ -0,0 +1,54 @@
/*
* Copyright © 2011 Marek Olšák <maraeo@gmail.com>
*
* 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 <maraeo@gmail.com>
*/
#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);
ASSERT_OUTSIDE_BEGIN_END(ctx);
ctx->Driver.TextureBarrier(ctx);
}

44
src/mesa/main/texturebarrier.h Normal file
View File

@@ -0,0 +1,44 @@
/*
* Copyright © 2011 Marek Olšák <maraeo@gmail.com>
*
* 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 <maraeo@gmail.com>
*/
#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 */

1
src/mesa/sources.mak
View File

@@ -94,6 +94,7 @@ MAIN_SOURCES = \
main/texrender.c \
main/texstate.c \
main/texstore.c \
main/texturebarrier.c \
main/transformfeedback.c \
main/uniforms.c \
main/varray.c \