Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve issues with GPA on Mesa for Apitrace #14

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Resolve issues with GPA on Mesa for Apitrace #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc993ea
Generate static lib
majanes-intel Feb 23, 2018
187f090
Disable rtti
majanes-intel Feb 23, 2018
b3264bf
Resolve clashes on apitrace entry points
majanes-intel Feb 23, 2018
2857aca
Obtain EGL entry points from the proper library.
majanes-intel Mar 6, 2018
6b9ae79
Compare substring of device name
majanes-intel Mar 6, 2018
72c0e60
Drop assertion on num counters check
majanes-intel Mar 6, 2018
9fe7a3b
Drop ext from entry points
majanes-intel Mar 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Build/Linux/Common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LINKFLAGS_SO = -shared -Wl,-z,defs $(ADDL_LINKFLAGS)
PLATFORM_CFLAG =
PLATFORM_LFLAG =
TARGET_SUFFIX =
ADDL_CFLAGS =
ADDL_CFLAGS = -fno-rtti
CFLAGS = -std=c++11 $(OPTIMIZE) -fPIC -D_LINUX -Wno-write-strings $(PLATFORM_CFLAG) $(ADDL_CFLAGS)
# ADDLCFLAGS = -Wall -Wno-unknown-pragmas -Wno-strict-aliasing -Wno-non-virtual-dtor -Werror -msse
PLATFORM_DIR = x64
Expand Down
2 changes: 1 addition & 1 deletion Src/GPUPerfAPI-Common/GPAHWInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ bool GPA_HWInfo::UpdateRevisionIdBasedOnDeviceIDAndName()
{
string thisMarketingName(it->m_szMarketingName);

if (thisMarketingName.compare(m_deviceName) == 0)
if (m_deviceName.find(thisMarketingName) != std::string::npos)
{
SetRevisionID(static_cast<gpa_uint32>(it->m_revID));
return true;
Expand Down
8 changes: 4 additions & 4 deletions Src/GPUPerfAPICounterGenerator/GLEntryPoints.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ extern decltype(wglGetProcAddress)* _wglGetProcAddress; ///< function pointer fo
#endif

#ifdef _LINUX
extern decltype(glXGetProcAddressARB)* _glXGetProcAddressARB; ///< function pointer for glXGetProcAddressARB
extern decltype(glXGetProcAddressARB)* _GPAglXGetProcAddressARB; ///< function pointer for glXGetProcAddressARB
#define GET_PROC_ADDRESS(f,type,name)\
(f) = (type) _glXGetProcAddressARB( (const GLubyte*) name);
(f) = (type) _GPAglXGetProcAddressARB( (const GLubyte*) name);
#endif

#else
Expand All @@ -49,9 +49,9 @@ extern decltype(glXGetProcAddressARB)* _glXGetProcAddressARB; ///< function poin
#include <GLES2/gl2ext.h>

// used for defining the proc addresses which are initialized below
extern decltype(eglGetProcAddress)* _eglGetProcAddress; ///< function pointer for eglGetProcAddress
extern decltype(eglGetProcAddress)* _GPAeglGetProcAddress; ///< function pointer for eglGetProcAddress
#define GET_PROC_ADDRESS(f,type,name)\
(f) = (type) _eglGetProcAddress(name);
(f) = (type) _GPAeglGetProcAddress(name);

#endif // GLES

Expand Down
43 changes: 22 additions & 21 deletions Src/GPUPerfAPIGL/GPUPerfAPIGL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,11 @@ gpa_uint32 GPA_IMP_GetPreferredCheckResultFrequency()
#endif

#ifdef _LINUX
decltype(glXGetProcAddressARB)* _glXGetProcAddressARB = nullptr;
decltype(glXGetProcAddressARB)* _GPAglXGetProcAddressARB = nullptr;
#endif

#else
decltype(eglGetProcAddress)* _eglGetProcAddress = nullptr;
decltype(eglGetProcAddress)* _GPAeglGetProcAddress = nullptr;
#endif

/// Checks the OpenGL extensions and initializes the various function pointers. The extensions queried are:
Expand All @@ -241,10 +241,11 @@ GPA_Status InitializeGLFunctions()
#ifdef _WIN32
HMODULE module = LoadLibraryA("opengl32.dll");
#else
void* module = dlopen("libGL.so", RTLD_LAZY);
void* egl_module = dlopen("libEGL.so", RTLD_LAZY);
void* gl_module = dlopen("libGL.so", RTLD_LAZY);
#endif

if (nullptr == module)
if ((nullptr == egl_module) || (nullptr == gl_module))
{
return GPA_STATUS_ERROR_NULL_POINTER;
}
Expand All @@ -264,9 +265,9 @@ GPA_Status InitializeGLFunctions()
#endif

#ifdef _LINUX
_glXGetProcAddressARB = reinterpret_cast<decltype(glXGetProcAddressARB)*>(dlsym(module, "glXGetProcAddressARB"));
_GPAglXGetProcAddressARB = reinterpret_cast<decltype(glXGetProcAddressARB)*>(dlsym(egl_module, "glXGetProcAddressARB"));

if (nullptr == _glXGetProcAddressARB)
if (nullptr == _GPAglXGetProcAddressARB)
{
return GPA_STATUS_ERROR_NULL_POINTER;
}
Expand All @@ -276,19 +277,19 @@ GPA_Status InitializeGLFunctions()
#else // GLES

#ifdef _WIN32
_eglGetProcAddress = reinterpret_cast<decltype(eglGetProcAddress)*>(GetProcAddress(module, "eglGetProcAddress"));
_GPAeglGetProcAddress = reinterpret_cast<decltype(eglGetProcAddress)*>(GetProcAddress(module, "eglGetProcAddress"));

if (nullptr == _eglGetProcAddress)
if (nullptr == _GPAeglGetProcAddress)
{
return GPA_STATUS_ERROR_NULL_POINTER;
}

#endif

#ifdef _LINUX
_eglGetProcAddress = reinterpret_cast<decltype(eglGetProcAddress)*>(dlsym(module, "eglGetProcAddress"));
_GPAeglGetProcAddress = reinterpret_cast<decltype(eglGetProcAddress)*>(dlsym(egl_module, "eglGetProcAddress"));

if (nullptr == _eglGetProcAddress)
if (nullptr == _GPAeglGetProcAddress)
{
return GPA_STATUS_ERROR_NULL_POINTER;
}
Expand All @@ -303,9 +304,9 @@ GPA_Status InitializeGLFunctions()
_oglGetIntegerv = reinterpret_cast<decltype(glGetIntegerv)*>(GetProcAddress(module, "glGetIntegerv"));
#endif
#ifdef _LINUX
_oglFlush = reinterpret_cast<decltype(glFlush)*>(dlsym(module, "glFlush"));
_oglGetString = reinterpret_cast<decltype(glGetString)*>(dlsym(module, "glGetString"));
_oglGetIntegerv = reinterpret_cast<decltype(glGetIntegerv)*>(dlsym(module, "glGetIntegerv"));
_oglFlush = reinterpret_cast<decltype(glFlush)*>(dlsym(gl_module, "glFlush"));
_oglGetString = reinterpret_cast<decltype(glGetString)*>(dlsym(gl_module, "glGetString"));
_oglGetIntegerv = reinterpret_cast<decltype(glGetIntegerv)*>(dlsym(gl_module, "glGetIntegerv"));
#endif

if (nullptr == _oglFlush || nullptr == _oglGetString || nullptr == _oglGetIntegerv)
Expand Down Expand Up @@ -499,14 +500,14 @@ GPA_Status InitializeGLFunctions()
GET_PROC_ADDRESS(_oglDeleteQueries, PFNGLDELETEQUERIESPROC, "glDeleteQueries");
GET_PROC_ADDRESS(_oglQueryCounter, PFNGLQUERYCOUNTERPROC, "glQueryCounter");
#else
GET_PROC_ADDRESS(_oglBeginQuery, PFNGLBEGINQUERYPROC, "glBeginQueryEXT");
GET_PROC_ADDRESS(_oglEndQuery, PFNGLENDQUERYPROC, "glEndQueryEXT");
GET_PROC_ADDRESS(_oglGetQueryiv, PFNGLGETQUERYIVPROC, "glGetQueryivEXT");
GET_PROC_ADDRESS(_oglBeginQuery, PFNGLBEGINQUERYPROC, "glBeginQuery");
GET_PROC_ADDRESS(_oglEndQuery, PFNGLENDQUERYPROC, "glEndQuery");
GET_PROC_ADDRESS(_oglGetQueryiv, PFNGLGETQUERYIVPROC, "glGetQueryiv");
GET_PROC_ADDRESS(_oglGetQueryObjectui64vEXT, PFNGLGETQUERYOBJECTUI64VEXTPROC, "glGetQueryObjectui64vEXT");
GET_PROC_ADDRESS(_oglGetQueryObjectiv, PFNGLGETQUERYOBJECTIVPROC, "glGetQueryObjectivEXT");
GET_PROC_ADDRESS(_oglGenQueries, PFNGLGENQUERIESPROC, "glGenQueriesEXT");
GET_PROC_ADDRESS(_oglDeleteQueries, PFNGLDELETEQUERIESPROC, "glDeleteQueriesEXT");
GET_PROC_ADDRESS(_oglQueryCounter, PFNGLQUERYCOUNTEREXTPROC, "glQueryCounterEXT");
GET_PROC_ADDRESS(_oglGetQueryObjectiv, PFNGLGETQUERYOBJECTIVPROC, "glGetQueryObjectiv");
GET_PROC_ADDRESS(_oglGenQueries, PFNGLGENQUERIESPROC, "glGenQueries");
GET_PROC_ADDRESS(_oglDeleteQueries, PFNGLDELETEQUERIESPROC, "glDeleteQueries");
GET_PROC_ADDRESS(_oglQueryCounter, PFNGLQUERYCOUNTERPROC, "glQueryCounter");

#ifndef GL_TIMESTAMP
#define GL_TIMESTAMP GL_TIMESTAMP_EXT
Expand Down Expand Up @@ -1032,7 +1033,7 @@ GPA_Status GPA_IMP_OpenContext(void* pContext)
// There will be no catastrophic errors if the GPA expects less counters than GL exposes, but we may not have the right counters... and may be reporting bad results.
// There could be major issues if the GPA expects more counters than GL exposes, because we may try to enable a counter that doesn't exist,
// in which case we hope the driver will return a 0 result and not write unexpected values into the register.
assert(pHardwareCounters->m_pGroups[g].m_numCounters == (unsigned int)nCounters);
// assert(pHardwareCounters->m_pGroups[g].m_numCounters >= (unsigned int)nCounters);

if (pHardwareCounters->m_pGroups[g].m_numCounters != (unsigned int)nCounters)
{
Expand Down
3 changes: 3 additions & 0 deletions Src/GPUPerfAPIGL/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ DEPTH = ../..
include $(DEPTH)/Build/Linux/Common.mk

TARGETSO = libGPUPerfAPIGL$(TARGET_SUFFIX).so
TARGETLIB = libGPUPerfAPIGL$(TARGET_SUFFIX).a
ADDL_DEFINES = -DGLX_GLXEXT_PROTOTYPES

INCLUDES = -I. \
Expand All @@ -30,5 +31,7 @@ SO_OBJS = \
./$(OBJ_DIR)/GPUPerfAPIGL.o \
./$(OBJ_DIR)/GLPerfMonitorCache.o

LIB_OBJS = $(SO_OBJS)

include $(DEPTH)/Build/Linux/CommonTargets.mk

6 changes: 5 additions & 1 deletion Src/GPUPerfAPIGLES/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
DEPTH = ../..
include $(DEPTH)/Build/Linux/Common.mk

TARGETSO = libGPUPerfAPIGLES$(TARGET_SUFFIX).so
# TARGETSO = libGPUPerfAPIGLES$(TARGET_SUFFIX).so
TARGETLIB = libGPUPerfAPIGLES$(TARGET_SUFFIX).a

ADDL_DEFINES = -DGLX_GLXEXT_PROTOTYPES -DGLES

INCLUDES = -I. \
Expand All @@ -30,5 +32,7 @@ SO_OBJS = \
./$(OBJ_DIR)/GPUPerfAPIGL.o \
./$(OBJ_DIR)/GLPerfMonitorCache.o

LIB_OBJS = $(SO_OBJS)

include $(DEPTH)/Build/Linux/CommonTargets.mk