KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: add support for memory object parameters 

V2 (Timothy Arceri):
 - fix copy and paste error with error message

V3 (Timothy Arceri):
 - drop the Protected field for now as its unused

Signed-off-by: Andres Rodriguez <andresx7@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Andres Rodriguez 2017-07-12 18:45:08 -04:00 committed by Timothy Arceri
parent 8b7c574479
commit 1e8e4ee230
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/mesa/main/externalobjects.c
View File

@ -73,6 +73,7 @@ _mesa_initialize_memory_object(struct gl_context *ctx,
{
memset(obj, 0, sizeof(struct gl_memory_object));
obj->Name = name;
obj->Dedicated = GL_FALSE;
}
void GLAPIENTRY
@ -168,7 +169,34 @@ _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
@ -176,7 +204,28 @@ _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,
"glGetMemoryObjectParameterivEXT(pname=0x%x)", pname);
}
void GLAPIENTRY
@ -380,6 +429,7 @@ _mesa_ImportMemoryFdEXT(GLuint memory,
return;
ctx->Driver.ImportMemoryObjectFd(ctx, memObj, size, fd);
memObj->Immutable = GL_TRUE;
}
void GLAPIENTRY

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

@ -4646,7 +4646,9 @@ 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 */
};
/**