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

mapi: add GL_ARB_bindless_texture entry points

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Samuel Pitoiset
2017-04-03 21:57:34 +02:00
parent d364ab4a61
commit 5f249b9f05
19 changed files with 363 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/mapi/glapi/gen/ARB_bindless_texture.xml Normal file
View File

@@ -0,0 +1,100 @@
<?xml version="1.0"?>
<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
<OpenGLAPI>
<category name="GL_ARB_bindless_texture" number="152">
<enum name="UNSIGNED_INT64_ARB" value="0x140F" />
<type name="uint64EXT" unsigned="true" size="8"/>
<function name="GetTextureHandleARB">
<return type="GLuint64"/>
<param name="texture" type="GLuint" />
</function>
<function name="GetTextureSamplerHandleARB">
<return type="GLuint64"/>
<param name="texture" type="GLuint" />
<param name="sampler" type="GLuint" />
</function>
<function name="MakeTextureHandleResidentARB">
<param name="handle" type="GLuint64" />
</function>
<function name="MakeTextureHandleNonResidentARB">
<param name="handle" type="GLuint64" />
</function>
<function name="GetImageHandleARB">
<return type="GLuint64"/>
<param name="texture" type="GLuint" />
<param name="level" type="GLint" />
<param name="layered" type="GLboolean" />
<param name="layer" type="GLint" />
<param name="format" type="GLenum" />
</function>
<function name="MakeImageHandleResidentARB">
<param name="handle" type="GLuint64" />
<param name="access" type="GLenum" />
</function>
<function name="MakeImageHandleNonResidentARB">
<param name="handle" type="GLuint64" />
</function>
<function name="UniformHandleui64ARB">
<param name="location" type="GLint" />
<param name="value" type="GLuint64" />
</function>
<function name="UniformHandleui64vARB">
<param name="location" type="GLint" />
<param name="count" type="GLsizei" />
<param name="value" type="const GLuint64 *" />
</function>
<function name="ProgramUniformHandleui64ARB">
<param name="program" type="GLuint" />
<param name="location" type="GLint" />
<param name="value" type="GLuint64" />
</function>
<function name="ProgramUniformHandleui64vARB">
<param name="program" type="GLuint" />
<param name="location" type="GLint" />
<param name="count" type="GLsizei" />
<param name="value" type="const GLuint64 *" />
</function>
<function name="IsTextureHandleResidentARB">
<return type="GLboolean"/>
<param name="handle" type="GLuint64" />
</function>
<function name="IsImageHandleResidentARB">
<return type="GLboolean"/>
<param name="handle" type="GLuint64" />
</function>
<function name="VertexAttribL1ui64ARB" exec="dynamic">
<param name="index" type="GLuint" />
<param name="x" type="GLuint64EXT" />
</function>
<function name="VertexAttribL1ui64vARB" exec="dynamic">
<param name="index" type="GLuint" />
<param name="v" type="const GLuint64EXT *" />
</function>
<function name="GetVertexAttribLui64vARB">
<param name="index" type="GLuint" />
<param name="pname" type="GLenum" />
<param name="params" type="GLuint64EXT *" />
</function>
</category>
</OpenGLAPI>

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

@@ -119,6 +119,7 @@ API_XML = \
gl_and_glX_API.xml \
ARB_base_instance.xml \
ARB_blend_func_extended.xml \
ARB_bindless_texture.xml \
ARB_clear_buffer_object.xml \
ARB_clear_texture.xml \
ARB_clip_control.xml \

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

@@ -8284,7 +8284,9 @@
<enum name="QUERY_BUFFER_BARRIER_BIT" value="0x00008000"/>
</category>
<!-- ARB extensions 149 - 152 -->
<!-- ARB extensions 149 - 151 -->
<xi:include href="ARB_bindless_texture.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="ARB_compute_variable_group_size.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

1
src/mapi/glapi/gen/gl_genexec.py
View File

@@ -113,6 +113,7 @@ header = """/**
#include "main/texstate.h"
#include "main/texstorage.h"
#include "main/barrier.h"
#include "main/texturebindless.h"
#include "main/textureview.h"
#include "main/transformfeedback.h"
#include "main/mtypes.h"

2
src/mesa/Makefile.sources
View File

@@ -240,6 +240,8 @@ MAIN_FILES = \
main/texstorage.h \
main/texstore.c \
main/texstore.h \
main/texturebindless.c \
main/texturebindless.h \
main/textureview.c \
main/textureview.h \
main/transformfeedback.c \

14
src/mesa/main/api_loopback.c
View File

@@ -1528,6 +1528,16 @@ _mesa_VertexAttribL1dv(GLuint index, const GLdouble *v)
ATTRIB1_D(index, v[0]);
}
void GLAPIENTRY
_mesa_VertexAttribL1ui64ARB(GLuint index, GLuint64EXT x)
{
}
void GLAPIENTRY
_mesa_VertexAttribL1ui64vARB(GLuint index, const GLuint64EXT *v)
{
}
void GLAPIENTRY
_mesa_VertexAttribL2dv(GLuint index, const GLdouble *v)
{
@@ -1789,5 +1799,9 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx,
SET_VertexAttribL2dv(dest, _mesa_VertexAttribL2dv);
SET_VertexAttribL3dv(dest, _mesa_VertexAttribL3dv);
SET_VertexAttribL4dv(dest, _mesa_VertexAttribL4dv);
/* GL_ARB_bindless_texture */
SET_VertexAttribL1ui64ARB(dest, _mesa_VertexAttribL1ui64ARB);
SET_VertexAttribL1ui64vARB(dest, _mesa_VertexAttribL1ui64vARB);
}
}

6
src/mesa/main/api_loopback.h
View File

@@ -481,4 +481,10 @@ void GLAPIENTRY
_mesa_VertexAttribL3dv(GLuint index, const GLdouble *v);
void GLAPIENTRY
_mesa_VertexAttribL4dv(GLuint index, const GLdouble *v);
void GLAPIENTRY
_mesa_VertexAttribL1ui64ARB(GLuint index, GLuint64EXT x);
void GLAPIENTRY
_mesa_VertexAttribL1ui64vARB(GLuint index, const GLuint64EXT *v);
#endif /* API_LOOPBACK_H */

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

@@ -1225,6 +1225,8 @@ typedef struct {
void (GLAPIENTRYP VertexAttribL3dv)( GLuint index, const GLdouble *v);
void (GLAPIENTRYP VertexAttribL4dv)( GLuint index, const GLdouble *v);
void (GLAPIENTRYP VertexAttribL1ui64ARB)( GLuint index, GLuint64EXT x);
void (GLAPIENTRYP VertexAttribL1ui64vARB)( GLuint index, const GLuint64EXT *v);
} GLvertexformat;

18
src/mesa/main/tests/dispatch_sanity.cpp
View File

@@ -2374,6 +2374,24 @@ const struct function gles2_functions_possible[] = {
/* GL_KHR_blend_equation_advanced */
{ "glBlendBarrierKHR", 20, -1 },
/* GL_ARB_bindless_texture */
{ "glGetTextureHandleARB", 40, -1 },
{ "glGetTextureSamplerHandleARB", 40, -1 },
{ "glMakeTextureHandleResidentARB", 40, -1 },
{ "glMakeTextureHandleNonResidentARB", 40, -1 },
{ "glIsTextureHandleResidentARB", 40, -1 },
{ "glGetImageHandleARB", 40, -1 },
{ "glMakeImageHandleResidentARB", 40, -1 },
{ "glMakeImageHandleNonResidentARB", 40, -1 },
{ "glIsImageHandleResidentARB", 40, -1 },
{ "glUniformHandleui64ARB", 40, -1 },
{ "glUniformHandleui64vARB", 40, -1 },
{ "glProgramUniformHandleui64ARB", 40, -1 },
{ "glProgramUniformHandleui64vARB", 40, -1 },
{ "glVertexAttribL1ui64ARB", 40, -1 },
{ "glVertexAttribL1ui64vARB", 40, -1 },
{ "glGetVertexAttribLui64vARB", 40, -1 },
{ NULL, 0, -1 }
};

85
src/mesa/main/texturebindless.c Normal file
View File

@@ -0,0 +1,85 @@
/*
* Copyright © 2017 Valve Corporation.
*
* 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.
*/
#include "glheader.h"
#include "context.h"
#include "enums.h"
#include "imports.h"
#include "macros.h"
#include "mtypes.h"
#include "texobj.h"
#include "texturebindless.h"
#include "util/set.h"
#include "util/hash_table.h"
GLuint64 GLAPIENTRY
_mesa_GetTextureHandleARB(GLuint texture)
{
return 0;
}
GLuint64 GLAPIENTRY
_mesa_GetTextureSamplerHandleARB(GLuint texture, GLuint sampler)
{
return 0;
}
void GLAPIENTRY
_mesa_MakeTextureHandleResidentARB(GLuint64 handle)
{
}
void GLAPIENTRY
_mesa_MakeTextureHandleNonResidentARB(GLuint64 handle)
{
}
GLuint64 GLAPIENTRY
_mesa_GetImageHandleARB(GLuint texture, GLint level, GLboolean layered,
GLint layer, GLenum format)
{
return 0;
}
void GLAPIENTRY
_mesa_MakeImageHandleResidentARB(GLuint64 handle, GLenum access)
{
}
void GLAPIENTRY
_mesa_MakeImageHandleNonResidentARB(GLuint64 handle)
{
}
GLboolean GLAPIENTRY
_mesa_IsTextureHandleResidentARB(GLuint64 handle)
{
return GL_FALSE;
}
GLboolean GLAPIENTRY
_mesa_IsImageHandleResidentARB(GLuint64 handle)
{
return GL_FALSE;
}

68
src/mesa/main/texturebindless.h Normal file
View File

@@ -0,0 +1,68 @@
/*
* Copyright © 2017 Valve Corporation.
*
* 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.
*/
#ifndef TEXTUREBINDLESS_H
#define TEXTUREBINDLESS_H
#include "mtypes.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* \name API functions
*/
/*@{*/
GLuint64 GLAPIENTRY
_mesa_GetTextureHandleARB(GLuint texture);
GLuint64 GLAPIENTRY
_mesa_GetTextureSamplerHandleARB(GLuint texture, GLuint sampler);
void GLAPIENTRY
_mesa_MakeTextureHandleResidentARB(GLuint64 handle);
void GLAPIENTRY
_mesa_MakeTextureHandleNonResidentARB(GLuint64 handle);
GLuint64 GLAPIENTRY
_mesa_GetImageHandleARB(GLuint texture, GLint level, GLboolean layered,
GLint layer, GLenum format);
void GLAPIENTRY
_mesa_MakeImageHandleResidentARB(GLuint64 handle, GLenum access);
void GLAPIENTRY
_mesa_MakeImageHandleNonResidentARB(GLuint64 handle);
GLboolean GLAPIENTRY
_mesa_IsTextureHandleResidentARB(GLuint64 handle);
GLboolean GLAPIENTRY
_mesa_IsImageHandleResidentARB(GLuint64 handle);
/*@}*/
#ifdef __cplusplus
}
#endif
#endif

24
src/mesa/main/uniforms.c
View File

@@ -294,6 +294,18 @@ _mesa_Uniform4iv(GLint location, GLsizei count, const GLint * value)
_mesa_uniform(location, count, value, ctx, ctx->_Shader->ActiveProgram, GLSL_TYPE_INT, 4);
}
void GLAPIENTRY
_mesa_UniformHandleui64ARB(GLint location, GLuint64 value)
{
}
void GLAPIENTRY
_mesa_UniformHandleui64vARB(GLint location, GLsizei count,
const GLuint64 *value)
{
}
/** Same as above with direct state access **/
void GLAPIENTRY
_mesa_ProgramUniform1f(GLuint program, GLint location, GLfloat v0)
@@ -485,6 +497,18 @@ _mesa_ProgramUniform4iv(GLuint program, GLint location, GLsizei count,
_mesa_uniform(location, count, value, ctx, shProg, GLSL_TYPE_INT, 4);
}
void GLAPIENTRY
_mesa_ProgramUniformHandleui64ARB(GLuint program, GLint location,
GLuint64 value)
{
}
void GLAPIENTRY
_mesa_ProgramUniformHandleui64vARB(GLuint program, GLint location,
GLsizei count, const GLuint64 *values)
{
}
/** OpenGL 3.0 GLuint-valued functions **/
void GLAPIENTRY

12
src/mesa/main/uniforms.h
View File

@@ -112,6 +112,18 @@ void GLAPIENTRY
_mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat *value);
void GLAPIENTRY
_mesa_UniformHandleui64ARB(GLint location, GLuint64 value);
void GLAPIENTRY
_mesa_UniformHandleui64vARB(GLint location, GLsizei count,
const GLuint64 *value);
void GLAPIENTRY
_mesa_ProgramUniformHandleui64ARB(GLuint program, GLint location,
GLuint64 value);
void GLAPIENTRY
_mesa_ProgramUniformHandleui64vARB(GLuint program, GLint location,
GLsizei count, const GLuint64 *values);
void GLAPIENTRY
_mesa_ProgramUniform1f(GLuint program, GLint, GLfloat);
void GLAPIENTRY

5
src/mesa/main/varray.c
View File

@@ -1353,6 +1353,11 @@ _mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
}
}
void GLAPIENTRY
_mesa_GetVertexAttribLui64vARB(GLuint index, GLenum pname, GLuint64EXT *params)
{
}
/** GL 3.0 */
void GLAPIENTRY

3
src/mesa/main/varray.h
View File

@@ -248,6 +248,9 @@ _mesa_GetVertexAttribLdv(GLuint index, GLenum pname, GLdouble *params);
extern void GLAPIENTRY
_mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params);
extern void GLAPIENTRY
_mesa_GetVertexAttribLui64vARB(GLuint index, GLenum pname, GLuint64EXT *params);
extern void GLAPIENTRY
_mesa_GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params);

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

@@ -217,6 +217,10 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
SET_VertexAttribL2dv(tab, vfmt->VertexAttribL2dv);
SET_VertexAttribL3dv(tab, vfmt->VertexAttribL3dv);
SET_VertexAttribL4dv(tab, vfmt->VertexAttribL4dv);
/* GL_ARB_bindless_texture */
SET_VertexAttribL1ui64ARB(tab, vfmt->VertexAttribL1ui64ARB);
SET_VertexAttribL1ui64vARB(tab, vfmt->VertexAttribL1ui64vARB);
}
}

9
src/mesa/vbo/vbo_attrib_tmp.h
View File

@@ -1302,6 +1302,15 @@ TAG(VertexAttribL4dv)(GLuint index, const GLdouble * v)
ERROR(GL_INVALID_VALUE);
}
static void GLAPIENTRY
TAG(VertexAttribL1ui64ARB)(GLuint index, GLuint64EXT x)
{
}
static void GLAPIENTRY
TAG(VertexAttribL1ui64vARB)(GLuint index, const GLuint64EXT *v)
{
}
#undef ATTR1FV
#undef ATTR2FV

3
src/mesa/vbo/vbo_exec_api.c
View File

@@ -1089,6 +1089,9 @@ vbo_exec_vtxfmt_init(struct vbo_exec_context *exec)
vfmt->VertexAttribL2dv = vbo_VertexAttribL2dv;
vfmt->VertexAttribL3dv = vbo_VertexAttribL3dv;
vfmt->VertexAttribL4dv = vbo_VertexAttribL4dv;
vfmt->VertexAttribL1ui64ARB = vbo_VertexAttribL1ui64ARB;
vfmt->VertexAttribL1ui64vARB = vbo_VertexAttribL1ui64vARB;
}

3
src/mesa/vbo/vbo_save_api.c
View File

@@ -1490,6 +1490,9 @@ _save_vtxfmt_init(struct gl_context *ctx)
vfmt->VertexAttribL3dv = _save_VertexAttribL3dv;
vfmt->VertexAttribL4dv = _save_VertexAttribL4dv;
vfmt->VertexAttribL1ui64ARB = _save_VertexAttribL1ui64ARB;
vfmt->VertexAttribL1ui64vARB = _save_VertexAttribL1ui64vARB;
/* This will all require us to fallback to saving the list as opcodes:
*/
vfmt->CallList = _save_CallList;