[Mesa-dev] [PATCH 03/27] mesa: add support for memory object parameters
Andres Rodriguez
andresx7 at gmail.com
Wed Jul 12 22:45:08 UTC 2017
Signed-off-by: Andres Rodriguez <andresx7 at gmail.com>
---
src/mesa/main/externalobjects.c | 54 ++++++++++++++++++++++++++++++++++++++++-
src/mesa/main/mtypes.h | 5 +++-
2 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/externalobjects.c b/src/mesa/main/externalobjects.c
index 2ae3f0b..edcb5bf 100644
--- a/src/mesa/main/externalobjects.c
+++ b/src/mesa/main/externalobjects.c
@@ -72,6 +72,8 @@ _mesa_initialize_memory_object(struct gl_context *ctx,
{
memset(obj, 0, sizeof(struct gl_memory_object));
obj->Name = name;
+ obj->Dedicated = GL_FALSE;
+ obj->Protected = GL_FALSE;
}
void GLAPIENTRY
@@ -143,7 +145,6 @@ _mesa_CreateMemoryObjectsEXT(GLsizei n, GLuint *memoryObjects)
GLsizei i;
for (i = 0; i < n; i++) {
struct gl_memory_object *memObj;
-
memoryObjects[i] = first + i;
/* allocate memory object */
@@ -167,7 +168,35 @@ _mesa_MemoryObjectParameterivEXT(GLuint memoryObject,
GLenum pname,
const GLint *params)
{
+ GET_CURRENT_CONTEXT(ctx);
+ struct gl_memory_object *memObj;
+
+ memObj = _mesa_lookup_memory_object(ctx, memoryObject);
+ if (!memObj)
+ return;
+
+ if (memObj->Immutable) {
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "glMemoryObjectParameterivEXT(memoryObject is immutable");
+ return;
+ }
+ switch (pname) {
+ case GL_DEDICATED_MEMORY_OBJECT_EXT:
+ memObj->Dedicated = (GLboolean) params[0];
+ break;
+ case GL_PROTECTED_MEMORY_OBJECT_EXT:
+ /* EXT_protected_textures not supported */
+ goto invalid_pname;
+ default:
+ goto invalid_pname;
+ }
+ return;
+
+invalid_pname:
+ _mesa_error(ctx, GL_INVALID_ENUM,
+ "glMemoryObjectParameterivEXT(pname=0x%x)",
+ pname);
}
void GLAPIENTRY
@@ -175,7 +204,29 @@ _mesa_GetMemoryObjectParameterivEXT(GLuint memoryObject,
GLenum pname,
GLint *params)
{
+ GET_CURRENT_CONTEXT(ctx);
+ struct gl_memory_object *memObj;
+
+ memObj = _mesa_lookup_memory_object(ctx, memoryObject);
+ if (!memObj)
+ return;
+
+ switch (pname) {
+ case GL_DEDICATED_MEMORY_OBJECT_EXT:
+ *params = (GLint) memObj->Dedicated;
+ break;
+ case GL_PROTECTED_MEMORY_OBJECT_EXT:
+ /* EXT_protected_textures not supported */
+ goto invalid_pname;
+ default:
+ goto invalid_pname;
+ }
+ return;
+invalid_pname:
+ _mesa_error(ctx, GL_INVALID_ENUM,
+ "glMemoryObjectParameterivEXT(pname=0x%x)",
+ pname);
}
void GLAPIENTRY
@@ -403,6 +454,7 @@ _mesa_ImportMemoryFdEXT(GLuint memory,
}
ctx->Driver.ImportMemoryObjectFd(ctx, memObj, size, fd);
+ memObj->Immutable = GL_TRUE;
}
void GLAPIENTRY
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index a720b07..8dcc1a8 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -4656,7 +4656,10 @@ struct gl_image_handle_object
struct gl_memory_object
{
- GLuint Name; /**< hash table ID/name */
+ GLuint Name; /**< hash table ID/name */
+ GLboolean Immutable; /**< denotes mutability state of parameters */
+ GLboolean Dedicated; /**< import memory from a dedicated allocation */
+ GLboolean Protected; /**< import memory from a protected allocation */
};
/**
--
2.9.3
More information about the mesa-dev
mailing list