From 894d10393225719c68dea71ad586e6f5e43f091b Mon Sep 17 00:00:00 2001 From: NicJA Date: Tue, 23 Jun 2015 22:01:54 +0000 Subject: [PATCH] finish transitioning from arosmesa -> mesa3dgl.library git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@50856 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/libs/mesa/src/aros/arosmesa/gl.conf | 481 --------------------- .../arosmesa/mesa3dgl_gallium.c} | 75 ++-- .../libs/mesa/src/aros/arosmesa/mesa3dgl_gallium.h | 18 + .../arosmesa/mesa3dgl_getopenglstatetrackerapi.c} | 5 +- .../arosmesa/mesa3dgl_glacreatecontext.c} | 72 +-- .../arosmesa/mesa3dgl_gladestroycontext.c} | 37 +- .../arosmesa/mesa3dgl_glagetconfig.c} | 16 +- .../arosmesa/mesa3dgl_glagetcurrentcontext.c} | 5 +- .../arosmesa/mesa3dgl_glagetprocaddress.c} | 5 +- .../arosmesa/mesa3dgl_glamakecurrent.c} | 24 +- .../arosmesa/mesa3dgl_glasetrast.c} | 26 +- .../arosmesa/mesa3dgl_glaswapbuffers.c} | 26 +- .../arosmesa/mesa3dgl_init.c} | 10 +- .../arosmesa/mesa3dgl_support.c} | 67 +-- .../libs/mesa/src/aros/arosmesa/mesa3dgl_support.h | 16 + .../libs/mesa/src/aros/arosmesa/mesa3dgl_types.h | 49 +++ .../libs/mesa/src/aros/arosmesa/mmakefile.src | 35 +- .../state_trackers/arosmesa/arosmesa_funcs.h | 15 - .../arosmesa/arosmesa_funcs_gallium.h | 17 - .../state_trackers/arosmesa/arosmesa_types.h | 53 --- 20 files changed, 299 insertions(+), 753 deletions(-) delete mode 100644 workbench/libs/mesa/src/aros/arosmesa/gl.conf rename workbench/libs/mesa/src/{gallium/state_trackers/arosmesa/arosmesa_funcs_gallium.c => aros/arosmesa/mesa3dgl_gallium.c} (76%) create mode 100644 workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_gallium.h rename workbench/libs/mesa/src/{gallium/state_trackers/arosmesa/getopenglstatetrackerapi.c => aros/arosmesa/mesa3dgl_getopenglstatetrackerapi.c} (88%) rename workbench/libs/mesa/src/{gallium/state_trackers/arosmesa/glacreatecontext.c => aros/arosmesa/mesa3dgl_glacreatecontext.c} (66%) rename workbench/libs/mesa/src/{gallium/state_trackers/arosmesa/gladestroycontext.c => aros/arosmesa/mesa3dgl_gladestroycontext.c} (53%) rename workbench/libs/mesa/src/{gallium/state_trackers/arosmesa/glagetconfig.c => aros/arosmesa/mesa3dgl_glagetconfig.c} (88%) rename workbench/libs/mesa/src/{gallium/state_trackers/arosmesa/glagetcurrentcontext.c => aros/arosmesa/mesa3dgl_glagetcurrentcontext.c} (85%) rename workbench/libs/mesa/src/{gallium/state_trackers/arosmesa/glagetprocaddress.c => aros/arosmesa/mesa3dgl_glagetprocaddress.c} (83%) rename workbench/libs/mesa/src/{gallium/state_trackers/arosmesa/glamakecurrent.c => aros/arosmesa/mesa3dgl_glamakecurrent.c} (58%) rename workbench/libs/mesa/src/{gallium/state_trackers/arosmesa/glasetrast.c => aros/arosmesa/mesa3dgl_glasetrast.c} (74%) rename workbench/libs/mesa/src/{gallium/state_trackers/arosmesa/glaswapbuffers.c => aros/arosmesa/mesa3dgl_glaswapbuffers.c} (53%) rename workbench/libs/mesa/src/{gallium/state_trackers/arosmesa/arosmesa_init.c => aros/arosmesa/mesa3dgl_init.c} (69%) rename workbench/libs/mesa/src/{gallium/state_trackers/arosmesa/arosmesa_funcs.c => aros/arosmesa/mesa3dgl_support.c} (76%) create mode 100644 workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_support.h create mode 100644 workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_types.h delete mode 100644 workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs.h delete mode 100644 workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs_gallium.h delete mode 100644 workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_types.h diff --git a/workbench/libs/mesa/src/aros/arosmesa/gl.conf b/workbench/libs/mesa/src/aros/arosmesa/gl.conf deleted file mode 100644 index 935bb50230..0000000000 --- a/workbench/libs/mesa/src/aros/arosmesa/gl.conf +++ /dev/null @@ -1,481 +0,0 @@ -##begin config -version 20.0 -libbase GLBase -##end config -##begin cdef -#include - -__BEGIN_DECLS - -GLAContext glACreateContextTags(Tag Tag1, ...); - -__END_DECLS - - -##end cdef -##begin functionlist -GLAContext glACreateContext(struct TagItem *tagList) -void glADestroyContext(GLAContext ctx) -void glAMakeCurrent(GLAContext ctx) -void glASwapBuffers(GLAContext ctx) -GLAContext glAGetCurrentContext() -APTR GetOpenGLStateTrackerApi() -void glASetRast(GLAContext ctx, struct TagItem *tagList) -void glAGetConfig(GLAContext ctx, GLenum pname, GLint* params) -GLAProc glAGetProcAddress(const GLubyte * procname) -.skip 21 -void glClearIndex(GLfloat c) -void glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) -void glClear(GLbitfield mask) -void glIndexMask(GLuint mask) -void glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) -void glAlphaFunc(GLenum func, GLclampf ref) -void glBlendFunc(GLenum sfactor, GLenum dfactor) -void glLogicOp(GLenum opcode) -void glCullFace(GLenum mode) -void glFrontFace(GLenum mode) -void glPointSize(GLfloat size) -void glLineWidth(GLfloat width) -void glLineStipple(GLint factor, GLushort pattern) -void glPolygonMode(GLenum face, GLenum mode) -void glPolygonOffset(GLfloat factor, GLfloat units) -void glPolygonStipple(const GLubyte * mask) -void glGetPolygonStipple(GLubyte * mask) -void glEdgeFlag(GLboolean flag) -void glEdgeFlagv(const GLboolean * flag) -void glScissor(GLint x, GLint y, GLsizei width, GLsizei height) -void glClipPlane(GLenum plane, const GLdouble * equation) -void glGetClipPlane(GLenum plane, GLdouble * equation) -void glDrawBuffer(GLenum mode) -void glReadBuffer(GLenum mode) -void glEnable(GLenum cap) -void glDisable(GLenum cap) -GLboolean glIsEnabled(GLenum cap) -void glEnableClientState(GLenum cap) -void glDisableClientState(GLenum cap) -void glGetBooleanv(GLenum pname, GLboolean * params) -void glGetDoublev(GLenum pname, GLdouble * params) -void glGetFloatv(GLenum pname, GLfloat * params) -void glGetIntegerv(GLenum pname, GLint * params) -void glPushAttrib(GLbitfield mask) -void glPopAttrib() -void glPushClientAttrib(GLbitfield mask) -void glPopClientAttrib() -GLint glRenderMode(GLenum mode) -GLenum glGetError() -const GLubyte * glGetString(GLenum name) -void glFinish() -void glFlush() -void glHint(GLenum target, GLenum mode) -void glClearDepth(GLclampd depth) -void glDepthFunc(GLenum func) -void glDepthMask(GLboolean flag) -void glDepthRange(GLclampd near_val, GLclampd far_val) -void glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) -void glAccum(GLenum op, GLfloat value) -void glMatrixMode(GLenum mode) -void glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val) -void glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val) -void glViewport(GLint x, GLint y, GLsizei width, GLsizei height) -void glPushMatrix() -void glPopMatrix() -void glLoadIdentity() -void glLoadMatrixd(const GLdouble * m) -void glLoadMatrixf(const GLfloat * m) -void glMultMatrixd(const GLdouble * m) -void glMultMatrixf(const GLfloat * m) -void glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z) -void glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) -void glScaled(GLdouble x, GLdouble y, GLdouble z) -void glScalef(GLfloat x, GLfloat y, GLfloat z) -void glTranslated(GLdouble x, GLdouble y, GLdouble z) -void glTranslatef(GLfloat x, GLfloat y, GLfloat z) -GLboolean glIsList(GLuint list) -void glDeleteLists(GLuint list, GLsizei range) -GLuint glGenLists(GLsizei range) -void glNewList(GLuint list, GLenum mode) -void glEndList() -void glCallList(GLuint list) -void glCallLists(GLsizei n, GLenum type, const GLvoid * lists) -void glListBase(GLuint base) -void glBegin(GLenum mode) -void glEnd() -void glVertex2d(GLdouble x, GLdouble y) -void glVertex2f(GLfloat x, GLfloat y) -void glVertex2i(GLint x, GLint y) -void glVertex2s(GLshort x, GLshort y) -void glVertex3d(GLdouble x, GLdouble y, GLdouble z) -void glVertex3f(GLfloat x, GLfloat y, GLfloat z) -void glVertex3i(GLint x, GLint y, GLint z) -void glVertex3s(GLshort x, GLshort y, GLshort z) -void glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) -void glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) -void glVertex4i(GLint x, GLint y, GLint z, GLint w) -void glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w) -void glVertex2dv(const GLdouble * v) -void glVertex2fv(const GLfloat * v) -void glVertex2iv(const GLint * v) -void glVertex2sv(const GLshort * v) -void glVertex3dv(const GLdouble * v) -void glVertex3fv(const GLfloat * v) -void glVertex3iv(const GLint * v) -void glVertex3sv(const GLshort * v) -void glVertex4dv(const GLdouble * v) -void glVertex4fv(const GLfloat * v) -void glVertex4iv(const GLint * v) -void glVertex4sv(const GLshort * v) -void glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz) -void glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz) -void glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz) -void glNormal3i(GLint nx, GLint ny, GLint nz) -void glNormal3s(GLshort nx, GLshort ny, GLshort nz) -void glNormal3bv(const GLbyte * v) -void glNormal3dv(const GLdouble * v) -void glNormal3fv(const GLfloat * v) -void glNormal3iv(const GLint * v) -void glNormal3sv(const GLshort * v) -void glIndexd(GLdouble c) -void glIndexf(GLfloat c) -void glIndexi(GLint c) -void glIndexs(GLshort c) -void glIndexub(GLubyte c) -void glIndexdv(const GLdouble * c) -void glIndexfv(const GLfloat * c) -void glIndexiv(const GLint * c) -void glIndexsv(const GLshort * c) -void glIndexubv(const GLubyte * c) -void glColor3b(GLbyte red, GLbyte green, GLbyte blue) -void glColor3d(GLdouble red, GLdouble green, GLdouble blue) -void glColor3f(GLfloat red, GLfloat green, GLfloat blue) -void glColor3i(GLint red, GLint green, GLint blue) -void glColor3s(GLshort red, GLshort green, GLshort blue) -void glColor3ub(GLubyte red, GLubyte green, GLubyte blue) -void glColor3ui(GLuint red, GLuint green, GLuint blue) -void glColor3us(GLushort red, GLushort green, GLushort blue) -void glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha) -void glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha) -void glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) -void glColor4i(GLint red, GLint green, GLint blue, GLint alpha) -void glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha) -void glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha) -void glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha) -void glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha) -void glColor3bv(const GLbyte * v) -void glColor3dv(const GLdouble * v) -void glColor3fv(const GLfloat * v) -void glColor3iv(const GLint * v) -void glColor3sv(const GLshort * v) -void glColor3ubv(const GLubyte * v) -void glColor3uiv(const GLuint * v) -void glColor3usv(const GLushort * v) -void glColor4bv(const GLbyte * v) -void glColor4dv(const GLdouble * v) -void glColor4fv(const GLfloat * v) -void glColor4iv(const GLint * v) -void glColor4sv(const GLshort * v) -void glColor4ubv(const GLubyte * v) -void glColor4uiv(const GLuint * v) -void glColor4usv(const GLushort * v) -void glTexCoord1d(GLdouble s) -void glTexCoord1f(GLfloat s) -void glTexCoord1i(GLint s) -void glTexCoord1s(GLshort s) -void glTexCoord2d(GLdouble s, GLdouble t) -void glTexCoord2f(GLfloat s, GLfloat t) -void glTexCoord2i(GLint s, GLint t) -void glTexCoord2s(GLshort s, GLshort t) -void glTexCoord3d(GLdouble s, GLdouble t, GLdouble r) -void glTexCoord3f(GLfloat s, GLfloat t, GLfloat r) -void glTexCoord3i(GLint s, GLint t, GLint r) -void glTexCoord3s(GLshort s, GLshort t, GLshort r) -void glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q) -void glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q) -void glTexCoord4i(GLint s, GLint t, GLint r, GLint q) -void glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q) -void glTexCoord1dv(const GLdouble * v) -void glTexCoord1fv(const GLfloat * v) -void glTexCoord1iv(const GLint * v) -void glTexCoord1sv(const GLshort * v) -void glTexCoord2dv(const GLdouble * v) -void glTexCoord2fv(const GLfloat * v) -void glTexCoord2iv(const GLint * v) -void glTexCoord2sv(const GLshort * v) -void glTexCoord3dv(const GLdouble * v) -void glTexCoord3fv(const GLfloat * v) -void glTexCoord3iv(const GLint * v) -void glTexCoord3sv(const GLshort * v) -void glTexCoord4dv(const GLdouble * v) -void glTexCoord4fv(const GLfloat * v) -void glTexCoord4iv(const GLint * v) -void glTexCoord4sv(const GLshort * v) -void glRasterPos2d(GLdouble x, GLdouble y) -void glRasterPos2f(GLfloat x, GLfloat y) -void glRasterPos2i(GLint x, GLint y) -void glRasterPos2s(GLshort x, GLshort y) -void glRasterPos3d(GLdouble x, GLdouble y, GLdouble z) -void glRasterPos3f(GLfloat x, GLfloat y, GLfloat z) -void glRasterPos3i(GLint x, GLint y, GLint z) -void glRasterPos3s(GLshort x, GLshort y, GLshort z) -void glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) -void glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) -void glRasterPos4i(GLint x, GLint y, GLint z, GLint w) -void glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w) -void glRasterPos2dv(const GLdouble * v) -void glRasterPos2fv(const GLfloat * v) -void glRasterPos2iv(const GLint * v) -void glRasterPos2sv(const GLshort * v) -void glRasterPos3dv(const GLdouble * v) -void glRasterPos3fv(const GLfloat * v) -void glRasterPos3iv(const GLint * v) -void glRasterPos3sv(const GLshort * v) -void glRasterPos4dv(const GLdouble * v) -void glRasterPos4fv(const GLfloat * v) -void glRasterPos4iv(const GLint * v) -void glRasterPos4sv(const GLshort * v) -void glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) -void glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) -void glRecti(GLint x1, GLint y1, GLint x2, GLint y2) -void glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2) -void glRectdv(const GLdouble * v1, const GLdouble * v2) -void glRectfv(const GLfloat * v1, const GLfloat * v2) -void glRectiv(const GLint * v1, const GLint * v2) -void glRectsv(const GLshort * v1, const GLshort * v2) -void glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * ptr) -void glNormalPointer(GLenum type, GLsizei stride, const GLvoid * ptr) -void glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * ptr) -void glIndexPointer(GLenum type, GLsizei stride, const GLvoid * ptr) -void glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * ptr) -void glEdgeFlagPointer(GLsizei stride, const GLvoid * ptr) -void glGetPointerv(GLenum pname, GLvoid * * params) -void glArrayElement(GLint i) -void glDrawArrays(GLenum mode, GLint first, GLsizei count) -void glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices) -void glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid * pointer) -void glShadeModel(GLenum mode) -void glLightf(GLenum light, GLenum pname, GLfloat param) -void glLighti(GLenum light, GLenum pname, GLint param) -void glLightfv(GLenum light, GLenum pname, const GLfloat * params) -void glLightiv(GLenum light, GLenum pname, const GLint * params) -void glGetLightfv(GLenum light, GLenum pname, GLfloat * params) -void glGetLightiv(GLenum light, GLenum pname, GLint * params) -void glLightModelf(GLenum pname, GLfloat param) -void glLightModeli(GLenum pname, GLint param) -void glLightModelfv(GLenum pname, const GLfloat * params) -void glLightModeliv(GLenum pname, const GLint * params) -void glMaterialf(GLenum face, GLenum pname, GLfloat param) -void glMateriali(GLenum face, GLenum pname, GLint param) -void glMaterialfv(GLenum face, GLenum pname, const GLfloat * params) -void glMaterialiv(GLenum face, GLenum pname, const GLint * params) -void glGetMaterialfv(GLenum face, GLenum pname, GLfloat * params) -void glGetMaterialiv(GLenum face, GLenum pname, GLint * params) -void glColorMaterial(GLenum face, GLenum mode) -void glPixelZoom(GLfloat xfactor, GLfloat yfactor) -void glPixelStoref(GLenum pname, GLfloat param) -void glPixelStorei(GLenum pname, GLint param) -void glPixelTransferf(GLenum pname, GLfloat param) -void glPixelTransferi(GLenum pname, GLint param) -void glPixelMapfv(GLenum map, GLsizei mapsize, const GLfloat * values) -void glPixelMapuiv(GLenum map, GLsizei mapsize, const GLuint * values) -void glPixelMapusv(GLenum map, GLsizei mapsize, const GLushort * values) -void glGetPixelMapfv(GLenum map, GLfloat * values) -void glGetPixelMapuiv(GLenum map, GLuint * values) -void glGetPixelMapusv(GLenum map, GLushort * values) -void glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte * bitmap) -void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels) -void glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels) -void glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type) -void glStencilFunc(GLenum func, GLint ref, GLuint mask) -void glStencilMask(GLuint mask) -void glStencilOp(GLenum fail, GLenum zfail, GLenum zpass) -void glClearStencil(GLint s) -void glTexGend(GLenum coord, GLenum pname, GLdouble param) -void glTexGenf(GLenum coord, GLenum pname, GLfloat param) -void glTexGeni(GLenum coord, GLenum pname, GLint param) -void glTexGendv(GLenum coord, GLenum pname, const GLdouble * params) -void glTexGenfv(GLenum coord, GLenum pname, const GLfloat * params) -void glTexGeniv(GLenum coord, GLenum pname, const GLint * params) -void glGetTexGendv(GLenum coord, GLenum pname, GLdouble * params) -void glGetTexGenfv(GLenum coord, GLenum pname, GLfloat * params) -void glGetTexGeniv(GLenum coord, GLenum pname, GLint * params) -void glTexEnvf(GLenum target, GLenum pname, GLfloat param) -void glTexEnvi(GLenum target, GLenum pname, GLint param) -void glTexEnvfv(GLenum target, GLenum pname, const GLfloat * params) -void glTexEnviv(GLenum target, GLenum pname, const GLint * params) -void glGetTexEnvfv(GLenum target, GLenum pname, GLfloat * params) -void glGetTexEnviv(GLenum target, GLenum pname, GLint * params) -void glTexParameterf(GLenum target, GLenum pname, GLfloat param) -void glTexParameteri(GLenum target, GLenum pname, GLint param) -void glTexParameterfv(GLenum target, GLenum pname, const GLfloat * params) -void glTexParameteriv(GLenum target, GLenum pname, const GLint * params) -void glGetTexParameterfv(GLenum target, GLenum pname, GLfloat * params) -void glGetTexParameteriv(GLenum target, GLenum pname, GLint * params) -void glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat * params) -void glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint * params) -void glTexImage1D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels) -void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels) -void glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid * pixels) -void glGenTextures(GLsizei n, GLuint * textures) -void glDeleteTextures(GLsizei n, const GLuint * textures) -void glBindTexture(GLenum target, GLuint texture) -void glPrioritizeTextures(GLsizei n, const GLuint * textures, const GLclampf * priorities) -GLboolean glAreTexturesResident(GLsizei n, const GLuint * textures, GLboolean * residences) -GLboolean glIsTexture(GLuint texture) -void glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels) -void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels) -void glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border) -void glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border) -void glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width) -void glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height) -void glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble * points) -void glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat * points) -void glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble * points) -void glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat * points) -void glGetMapdv(GLenum target, GLenum query, GLdouble * v) -void glGetMapfv(GLenum target, GLenum query, GLfloat * v) -void glGetMapiv(GLenum target, GLenum query, GLint * v) -void glEvalCoord1d(GLdouble u) -void glEvalCoord1f(GLfloat u) -void glEvalCoord1dv(const GLdouble * u) -void glEvalCoord1fv(const GLfloat * u) -void glEvalCoord2d(GLdouble u, GLdouble v) -void glEvalCoord2f(GLfloat u, GLfloat v) -void glEvalCoord2dv(const GLdouble * u) -void glEvalCoord2fv(const GLfloat * u) -void glMapGrid1d(GLint un, GLdouble u1, GLdouble u2) -void glMapGrid1f(GLint un, GLfloat u1, GLfloat u2) -void glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2) -void glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2) -void glEvalPoint1(GLint i) -void glEvalPoint2(GLint i, GLint j) -void glEvalMesh1(GLenum mode, GLint i1, GLint i2) -void glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2) -void glFogf(GLenum pname, GLfloat param) -void glFogi(GLenum pname, GLint param) -void glFogfv(GLenum pname, const GLfloat * params) -void glFogiv(GLenum pname, const GLint * params) -void glFeedbackBuffer(GLsizei size, GLenum type, GLfloat * buffer) -void glPassThrough(GLfloat token) -void glSelectBuffer(GLsizei size, GLuint * buffer) -void glInitNames() -void glLoadName(GLuint name) -void glPushName(GLuint name) -void glPopName() -void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices) -void glTexImage3D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels) -void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * pixels) -void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height) -void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * table) -void glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid * data) -void glColorTableParameteriv(GLenum target, GLenum pname, const GLint * params) -void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat * params) -void glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width) -void glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width) -void glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid * table) -void glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat * params) -void glGetColorTableParameteriv(GLenum target, GLenum pname, GLint * params) -void glBlendEquation(GLenum mode) -void glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) -void glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink) -void glResetHistogram(GLenum target) -void glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values) -void glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat * params) -void glGetHistogramParameteriv(GLenum target, GLenum pname, GLint * params) -void glMinmax(GLenum target, GLenum internalformat, GLboolean sink) -void glResetMinmax(GLenum target) -void glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid * values) -void glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat * params) -void glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint * params) -void glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * image) -void glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * image) -void glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params) -void glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat * params) -void glConvolutionParameteri(GLenum target, GLenum pname, GLint params) -void glConvolutionParameteriv(GLenum target, GLenum pname, const GLint * params) -void glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width) -void glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height) -void glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid * image) -void glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat * params) -void glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint * params) -void glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * row, const GLvoid * column) -void glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span) -void glActiveTexture(GLenum texture) -void glClientActiveTexture(GLenum texture) -void glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data) -void glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data) -void glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data) -void glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data) -void glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data) -void glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data) -void glGetCompressedTexImage(GLenum target, GLint lod, GLvoid * img) -void glMultiTexCoord1d(GLenum target, GLdouble s) -void glMultiTexCoord1dv(GLenum target, const GLdouble * v) -void glMultiTexCoord1f(GLenum target, GLfloat s) -void glMultiTexCoord1fv(GLenum target, const GLfloat * v) -void glMultiTexCoord1i(GLenum target, GLint s) -void glMultiTexCoord1iv(GLenum target, const GLint * v) -void glMultiTexCoord1s(GLenum target, GLshort s) -void glMultiTexCoord1sv(GLenum target, const GLshort * v) -void glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t) -void glMultiTexCoord2dv(GLenum target, const GLdouble * v) -void glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t) -void glMultiTexCoord2fv(GLenum target, const GLfloat * v) -void glMultiTexCoord2i(GLenum target, GLint s, GLint t) -void glMultiTexCoord2iv(GLenum target, const GLint * v) -void glMultiTexCoord2s(GLenum target, GLshort s, GLshort t) -void glMultiTexCoord2sv(GLenum target, const GLshort * v) -void glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r) -void glMultiTexCoord3dv(GLenum target, const GLdouble * v) -void glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r) -void glMultiTexCoord3fv(GLenum target, const GLfloat * v) -void glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r) -void glMultiTexCoord3iv(GLenum target, const GLint * v) -void glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r) -void glMultiTexCoord3sv(GLenum target, const GLshort * v) -void glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q) -void glMultiTexCoord4dv(GLenum target, const GLdouble * v) -void glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q) -void glMultiTexCoord4fv(GLenum target, const GLfloat * v) -void glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q) -void glMultiTexCoord4iv(GLenum target, const GLint * v) -void glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q) -void glMultiTexCoord4sv(GLenum target, const GLshort * v) -void glLoadTransposeMatrixd(const GLdouble * m) -void glLoadTransposeMatrixf(const GLfloat * m) -void glMultTransposeMatrixd(const GLdouble * m) -void glMultTransposeMatrixf(const GLfloat * m) -void glSampleCoverage(GLclampf value, GLboolean invert) -void glActiveTextureARB(GLenum texture) -void glClientActiveTextureARB(GLenum texture) -void glMultiTexCoord1dARB(GLenum target, GLdouble s) -void glMultiTexCoord1dvARB(GLenum target, const GLdouble * v) -void glMultiTexCoord1fARB(GLenum target, GLfloat s) -void glMultiTexCoord1fvARB(GLenum target, const GLfloat * v) -void glMultiTexCoord1iARB(GLenum target, GLint s) -void glMultiTexCoord1ivARB(GLenum target, const GLint * v) -void glMultiTexCoord1sARB(GLenum target, GLshort s) -void glMultiTexCoord1svARB(GLenum target, const GLshort * v) -void glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t) -void glMultiTexCoord2dvARB(GLenum target, const GLdouble * v) -void glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t) -void glMultiTexCoord2fvARB(GLenum target, const GLfloat * v) -void glMultiTexCoord2iARB(GLenum target, GLint s, GLint t) -void glMultiTexCoord2ivARB(GLenum target, const GLint * v) -void glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t) -void glMultiTexCoord2svARB(GLenum target, const GLshort * v) -void glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r) -void glMultiTexCoord3dvARB(GLenum target, const GLdouble * v) -void glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r) -void glMultiTexCoord3fvARB(GLenum target, const GLfloat * v) -void glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r) -void glMultiTexCoord3ivARB(GLenum target, const GLint * v) -void glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r) -void glMultiTexCoord3svARB(GLenum target, const GLshort * v) -void glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q) -void glMultiTexCoord4dvARB(GLenum target, const GLdouble * v) -void glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q) -void glMultiTexCoord4fvARB(GLenum target, const GLfloat * v) -void glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q) -void glMultiTexCoord4ivARB(GLenum target, const GLint * v) -void glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q) -void glMultiTexCoord4svARB(GLenum target, const GLshort * v) -##end functionlist diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs_gallium.c b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_gallium.c similarity index 76% rename from workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs_gallium.c rename to workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_gallium.c index f2d2e35d33..55f2ab96b4 100644 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs_gallium.c +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_gallium.c @@ -1,19 +1,24 @@ /* - Copyright 2009-2014, The AROS Development Team. All rights reserved. + Copyright 2009-2015, The AROS Development Team. All rights reserved. $Id$ */ -#include "arosmesa_funcs.h" -#include "arosmesa_funcs_gallium.h" -#include "main/context.h" #include #include +#include + #include #include -#include + +#include "main/context.h" + +#define DEBUG 1 #include -static BOOL AROSMesaSelectColorFormat(enum pipe_format * colorFormat, +#include "mesa3dgl_funcs.h" +#include "mesa3dgl_gallium.h" + +static BOOL MESA3DGLSelectColorFormat(enum pipe_format * colorFormat, struct pipe_screen * screen, GLint bpp) { *colorFormat = PIPE_FORMAT_NONE; @@ -43,7 +48,7 @@ static BOOL AROSMesaSelectColorFormat(enum pipe_format * colorFormat, return FALSE; } -static BOOL AROSMesaSelectDepthStencilFormat(enum pipe_format * depthStencilFormat, +static BOOL MESA3DGLSelectDepthStencilFormat(enum pipe_format * depthStencilFormat, struct pipe_screen * screen, BOOL noDepth, BOOL noStencil) { /* Defeaul values */ @@ -87,11 +92,11 @@ static BOOL AROSMesaSelectDepthStencilFormat(enum pipe_format * depthStencilForm return FALSE; } -BOOL AROSMesaFillVisual(struct st_visual * stvis, struct pipe_screen * screen, int bpp, struct TagItem *tagList) +BOOL MESA3DGLFillVisual(struct st_visual * stvis, struct pipe_screen * screen, int bpp, struct TagItem *tagList) { BOOL noDepth, noStencil, noAccum; - D(bug("[AROSMESA] AROSMesaFillVisual\n")); + D(bug("[MESA3DGL] MESA3DGLFillVisual\n")); noStencil = GetTagData(GLA_NoStencil, GL_FALSE, tagList); noAccum = GetTagData(GLA_NoAccum, GL_FALSE, tagList); @@ -105,16 +110,16 @@ BOOL AROSMesaFillVisual(struct st_visual * stvis, struct pipe_screen * screen, i stvis->buffer_mask = 0; /* Color buffer */ - if (!AROSMesaSelectColorFormat(&stvis->color_format, screen, bpp)) + if (!MESA3DGLSelectColorFormat(&stvis->color_format, screen, bpp)) { - D(bug("[AROSMESA] AROSMesaFillVisual - ERROR - No supported color format found\n")); + D(bug("[MESA3DGL] MESA3DGLFillVisual - ERROR - No supported color format found\n")); return FALSE; } /* Z-buffer / Stencil buffer */ - if (!AROSMesaSelectDepthStencilFormat(&stvis->depth_stencil_format, screen, noDepth, noStencil)) + if (!MESA3DGLSelectDepthStencilFormat(&stvis->depth_stencil_format, screen, noDepth, noStencil)) { - D(bug("[AROSMESA] AROSMesaFillVisual - ERROR - No supported depth/stencil format found\n")); + D(bug("[MESA3DGL] MESA3DGLFillVisual - ERROR - No supported depth/stencil format found\n")); return FALSE; } @@ -124,7 +129,7 @@ BOOL AROSMesaFillVisual(struct st_visual * stvis, struct pipe_screen * screen, i else stvis->accum_format = PIPE_FORMAT_R16G16B16A16_SNORM; - /* Buffers */ /* AROSMesa uses front buffer as back buffer */ + /* Buffers */ /* MESA3DGL uses front buffer as back buffer */ stvis->buffer_mask |= ST_ATTACHMENT_FRONT_LEFT_MASK; if (!noDepth || !noStencil) stvis->buffer_mask |= ST_ATTACHMENT_DEPTH_STENCIL_MASK; @@ -132,7 +137,7 @@ BOOL AROSMesaFillVisual(struct st_visual * stvis, struct pipe_screen * screen, i return TRUE; } -static VOID AROSMesaFrameBufferCreateResource(struct arosmesa_framebuffer * amfb, +static VOID MESA3DGLFrameBufferCreateResource(struct mesa3dgl_framebuffer * amfb, const enum st_attachment_type statt) { struct pipe_resource templ; @@ -169,10 +174,10 @@ static VOID AROSMesaFrameBufferCreateResource(struct arosmesa_framebuffer * amfb amfb->textures[statt] = amfb->screen->resource_create(amfb->screen, &templ); } -static boolean AROSMesaFrameBufferValidate(struct st_framebuffer_iface *stfbi, +static boolean MESA3DGLFrameBufferValidate(struct st_framebuffer_iface *stfbi, const enum st_attachment_type *statts, unsigned count, struct pipe_resource **out) { - struct arosmesa_framebuffer * amfb = (struct arosmesa_framebuffer *)stfbi; + struct mesa3dgl_framebuffer * amfb = (struct mesa3dgl_framebuffer *)stfbi; LONG i; /* Check for resize */ @@ -192,7 +197,7 @@ static boolean AROSMesaFrameBufferValidate(struct st_framebuffer_iface *stfbi, { if (amfb->textures[statts[i]] == NULL) { - AROSMesaFrameBufferCreateResource(amfb, statts[i]); + MESA3DGLFrameBufferCreateResource(amfb, statts[i]); if (statts[i] == ST_ATTACHMENT_FRONT_LEFT) { pipe_resource_reference(&amfb->render_resource, amfb->textures[ST_ATTACHMENT_FRONT_LEFT]); @@ -212,31 +217,31 @@ static boolean AROSMesaFrameBufferValidate(struct st_framebuffer_iface *stfbi, return TRUE; } -static boolean AROSMesaFrameBufferFlushFront(struct st_framebuffer_iface *stfbi, +static boolean MESA3DGLFrameBufferFlushFront(struct st_framebuffer_iface *stfbi, enum st_attachment_type statt) { /* No Op */ return TRUE; } -struct arosmesa_framebuffer * AROSMesaNewFrameBuffer(struct arosmesa_context * amesa, struct st_visual * stvis) +struct mesa3dgl_framebuffer * MESA3DGLNewFrameBuffer(struct mesa3dgl_context * ctx, struct st_visual * stvis) { - struct arosmesa_framebuffer * framebuffer = - AllocVec(sizeof(struct arosmesa_framebuffer), MEMF_PUBLIC | MEMF_CLEAR); + struct mesa3dgl_framebuffer * framebuffer = + AllocVec(sizeof(struct mesa3dgl_framebuffer), MEMF_PUBLIC | MEMF_CLEAR); if (!framebuffer) return NULL; framebuffer->stvis = *stvis; framebuffer->base.visual = &framebuffer->stvis; - framebuffer->base.flush_front = AROSMesaFrameBufferFlushFront; - framebuffer->base.validate = AROSMesaFrameBufferValidate; - framebuffer->screen = amesa->stmanager->screen; + framebuffer->base.flush_front = MESA3DGLFrameBufferFlushFront; + framebuffer->base.validate = MESA3DGLFrameBufferValidate; + framebuffer->screen = ctx->stmanager->screen; return framebuffer; } -VOID AROSMesaFreeFrameBuffer(struct arosmesa_framebuffer * framebuffer) +VOID MESA3DGLFreeFrameBuffer(struct mesa3dgl_framebuffer * framebuffer) { if (framebuffer) { @@ -251,21 +256,21 @@ VOID AROSMesaFreeFrameBuffer(struct arosmesa_framebuffer * framebuffer) } } -VOID AROSMesaCheckAndUpdateBufferSize(struct arosmesa_context * amesa) +VOID MESA3DGLCheckAndUpdateBufferSize(struct mesa3dgl_context * ctx) { - AROSMesaRecalculateBufferWidthHeight(amesa); - if (amesa->framebuffer->resized) - amesa->st->notify_invalid_framebuffer(amesa->st, - (struct st_framebuffer_iface *) amesa->framebuffer); + MESA3DGLRecalculateBufferWidthHeight(ctx); + if (ctx->framebuffer->resized) + ctx->st->notify_invalid_framebuffer(ctx->st, + (struct st_framebuffer_iface *) ctx->framebuffer); } -static int AROSMesaStManagerGetParam(struct st_manager *smapi, +static int MESA3DGLStManagerGetParam(struct st_manager *smapi, enum st_manager_param param) { return 0; } -struct st_manager * AROSMesaNewStManager(struct pipe_screen * pscreen) +struct st_manager * MESA3DGLNewStManager(struct pipe_screen * pscreen) { struct st_manager * stmanager = (struct st_manager *)AllocVec(sizeof(struct st_manager), MEMF_PUBLIC | MEMF_CLEAR); @@ -273,13 +278,13 @@ struct st_manager * AROSMesaNewStManager(struct pipe_screen * pscreen) if (stmanager) { stmanager->screen = pscreen; - stmanager->get_param = AROSMesaStManagerGetParam; + stmanager->get_param = MESA3DGLStManagerGetParam; } return stmanager; } -VOID AROSMesaFreeStManager(struct st_manager * stmanager) +VOID MESA3DGLFreeStManager(struct st_manager * stmanager) { if (stmanager) { diff --git a/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_gallium.h b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_gallium.h new file mode 100644 index 0000000000..0231d10d4f --- /dev/null +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_gallium.h @@ -0,0 +1,18 @@ +/* + Copyright 2009-2015, The AROS Development Team. All rights reserved. + $Id$ +*/ + +#ifndef MESA3DGL_GALLIUM_H +#define MESA3DGL_GALLIUM_H + +#include "mesa3dgl_types.h" + +BOOL MESA3DGLFillVisual(struct st_visual * stvis, struct pipe_screen * screen, GLint bpp, struct TagItem *tagList); +struct mesa3dgl_framebuffer * MESA3DGLNewFrameBuffer(struct mesa3dgl_context * ctx, struct st_visual * stvis); +VOID MESA3DGLFreeFrameBuffer(struct mesa3dgl_framebuffer * framebuffer); +VOID MESA3DGLCheckAndUpdateBufferSize(struct mesa3dgl_context * ctx); +struct st_manager * MESA3DGLNewStManager(); +VOID MESA3DGLFreeStManager(struct st_manager * stmanager); + +#endif /* MESA3DGL_GALLIUM_H */ diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/getopenglstatetrackerapi.c b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_getopenglstatetrackerapi.c similarity index 88% rename from workbench/libs/mesa/src/gallium/state_trackers/arosmesa/getopenglstatetrackerapi.c rename to workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_getopenglstatetrackerapi.c index f4ffb44108..5726db9ac7 100644 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/getopenglstatetrackerapi.c +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_getopenglstatetrackerapi.c @@ -1,11 +1,12 @@ /* - Copyright 2014, The AROS Development Team. All rights reserved. + Copyright 2014-2015, The AROS Development Team. All rights reserved. $Id$ */ -#include "state_tracker/st_gl_api.h" #include +#include "state_tracker/st_gl_api.h" + /***************************************************************************** NAME */ diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glacreatecontext.c b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glacreatecontext.c similarity index 66% rename from workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glacreatecontext.c rename to workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glacreatecontext.c index 12bee0f0c3..8972874c12 100644 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glacreatecontext.c +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glacreatecontext.c @@ -1,17 +1,21 @@ /* - Copyright 2009-2010, The AROS Development Team. All rights reserved. + Copyright 2009-2015, The AROS Development Team. All rights reserved. $Id$ */ -#include "arosmesa_funcs.h" -#include "arosmesa_funcs_gallium.h" -#include +#define DEBUG 1 #include + +#include #include + #include #include #include +#include "mesa3dgl_funcs.h" +#include "mesa3dgl_gallium.h" + /***************************************************************************** NAME */ @@ -94,69 +98,69 @@ *****************************************************************************/ { - struct arosmesa_context * amesa = NULL; + struct mesa3dgl_context * ctx = NULL; struct pipe_screen * pscreen = NULL; struct st_context_attribs attribs = {0}; - /* Allocate arosmesa_context struct initialized to zeros */ - if (!(amesa = (struct arosmesa_context *)AllocVec(sizeof(struct arosmesa_context), MEMF_PUBLIC | MEMF_CLEAR))) + /* Allocate MESA3DGL context */ + if (!(ctx = (struct mesa3dgl_context *)AllocVec(sizeof(struct mesa3dgl_context), MEMF_PUBLIC | MEMF_CLEAR))) { - D(bug("[AROSMESA] AROSMesaCreateContext: ERROR - failed to allocate AROSMesaContext\n")); + bug("%s: ERROR - failed to allocate GLAContext\n", __PRETTY_FUNCTION__); return NULL; } - - AROSMesaSelectRastPort(amesa, tagList); - if (!amesa->visible_rp) + + MESA3DGLSelectRastPort(ctx, tagList); + if (!ctx->visible_rp) { - D(bug("[AROSMESA] AROSMesaCreateContext: ERROR - failed to select visible rastport\n")); + bug("%s: ERROR - failed to select visible rastport\n", __PRETTY_FUNCTION__); goto error_out; } - - AROSMesaStandardInit(amesa, tagList); + + MESA3DGLStandardInit(ctx, tagList); pscreen = CreatePipeScreenV(NULL); if (!pscreen) { - D(bug("[AROSMESA] AROSMesaCreateContext: ERROR - failed to create gallium pipe screen\n")); + bug("%s: ERROR - failed to create gallium pipe screen\n", __PRETTY_FUNCTION__); goto error_out; } - if (!(amesa->stmanager = AROSMesaNewStManager(pscreen))) + if (!(ctx->stmanager = MESA3DGLNewStManager(pscreen))) { - D(bug("[AROSMESA] AROSMesaCreateContext: ERROR - failed to create ST Manager\n")); + bug("%s: ERROR - failed to create ST Manager\n"); DestroyPipeScreen(pscreen); goto error_out; } - D(bug("[AROSMESA] AROSMesaCreateContext: Filling ST Visual \n")); - if (!AROSMesaFillVisual(&amesa->stvis, amesa->stmanager->screen, amesa->BitsPerPixel, tagList)) + D(bug("[MESA3DGL] %s: Filling ST Visual \n", __PRETTY_FUNCTION__)); + if (!MESA3DGLFillVisual(&ctx->stvis, ctx->stmanager->screen, ctx->BitsPerPixel, tagList)) { - D(bug("[AROSMESA] AROSMesaCreateContext: ERROR - failed to fill ST Visual\n")); + bug("%s: ERROR - failed to fill ST Visual\n", __PRETTY_FUNCTION__); goto error_out; } attribs.profile = ST_PROFILE_DEFAULT; - attribs.visual = amesa->stvis; - - amesa->st = glstapi->create_context(glstapi, amesa->stmanager, &attribs, NULL); - if (!amesa->st) + attribs.visual = ctx->stvis; + + ctx->st = glstapi->create_context(glstapi, ctx->stmanager, &attribs, NULL); + if (!ctx->st) { - D(bug("[AROSMESA] AROSMesaCreateContext: ERROR - failed to create mesa state tracker context\n")); + bug("%s: ERROR - failed to create mesa state tracker context\n", __PRETTY_FUNCTION__); goto error_out; } - - amesa->framebuffer = AROSMesaNewFrameBuffer(amesa, &amesa->stvis); - if (!amesa->framebuffer) + ctx->framebuffer = MESA3DGLNewFrameBuffer(ctx, &ctx->stvis); + + if (!ctx->framebuffer) { - D(bug("[AROSMESA] AROSMesaCreateContext: ERROR - failed to create frame buffer\n")); + bug("%s: ERROR - failed to create frame buffer\n", __PRETTY_FUNCTION__); goto error_out; } - - return amesa; + + return (GLAContext)ctx; error_out: - if (amesa->stmanager) AROSMesaFreeStManager(amesa->stmanager); - if (amesa) AROSMesaFreeContext(amesa); - return NULL; + if (ctx->stmanager) MESA3DGLFreeStManager(ctx->stmanager); + if (ctx) MESA3DGLFreeContext(ctx); + return (GLAContext)NULL; } diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/gladestroycontext.c b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_gladestroycontext.c similarity index 53% rename from workbench/libs/mesa/src/gallium/state_trackers/arosmesa/gladestroycontext.c rename to workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_gladestroycontext.c index 823cd42ebf..8801fefd86 100644 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/gladestroycontext.c +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_gladestroycontext.c @@ -1,13 +1,16 @@ /* - Copyright 2009-2014, The AROS Development Team. All rights reserved. + Copyright 2009-2015, The AROS Development Team. All rights reserved. $Id$ */ -#include "arosmesa_funcs.h" -#include "arosmesa_funcs_gallium.h" +#define DEBUG 1 +#include + #include #include -#include + +#include "mesa3dgl_funcs.h" +#include "mesa3dgl_gallium.h" /***************************************************************************** @@ -22,7 +25,7 @@ Destroys the GL rendering context and frees all resoureces. INPUTS - amesa - pointer to GL rendering context. A NULL pointer will be + ctx - pointer to GL rendering context. A NULL pointer will be ignored. RESULT @@ -36,31 +39,31 @@ *****************************************************************************/ { - struct arosmesa_context * amesa = (struct arosmesa_context *)ctx; + struct mesa3dgl_context * _ctx = (struct mesa3dgl_context *)ctx; - /* Destroy a AROSMesa context */ - D(bug("[AROSMESA] AROSMesaDestroyContext(amesa @ %x)\n", amesa)); + /* Destroy a MESA3DGL context */ + D(bug("[MESA3DGL] %s(ctx @ %x)\n", __PRETTY_FUNCTION__, ctx)); - if (amesa) + if (_ctx) { - struct st_context_iface * ctx = amesa->st; + struct st_context_iface * st_ctx = _ctx->st; - if (ctx) + if (st_ctx) { struct st_context_iface * cur_ctx = glstapi->get_current(glstapi); - if (cur_ctx == ctx) + if (cur_ctx == st_ctx) { /* Unbind if current */ - amesa->st->flush(amesa->st, 0, NULL); + _ctx->st->flush(_ctx->st, 0, NULL); glstapi->make_current(glstapi, NULL, NULL, NULL); } - amesa->st->destroy(amesa->st); - AROSMesaFreeFrameBuffer(amesa->framebuffer); - AROSMesaFreeStManager(amesa->stmanager); + _ctx->st->destroy(_ctx->st); + MESA3DGLFreeFrameBuffer(_ctx->framebuffer); + MESA3DGLFreeStManager(_ctx->stmanager); glstapi->destroy(glstapi); - AROSMesaFreeContext(amesa); + MESA3DGLFreeContext(_ctx); } } } diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glagetconfig.c b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glagetconfig.c similarity index 88% rename from workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glagetconfig.c rename to workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glagetconfig.c index 5c25823da9..e0d9b5c355 100644 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glagetconfig.c +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glagetconfig.c @@ -1,11 +1,13 @@ /* - Copyright 2011-2014, The AROS Development Team. All rights reserved. + Copyright 2011-2015, The AROS Development Team. All rights reserved. $Id$ */ -#include "arosmesa_funcs.h" #include +#include "mesa3dgl_types.h" +#include "mesa3dgl_funcs.h" + /***************************************************************************** NAME */ @@ -40,9 +42,9 @@ *****************************************************************************/ { LONG depthbits, stencilbits, accumbits, rbbits, gbits, abits; - struct arosmesa_context * amesa = (struct arosmesa_context *)ctx; + struct mesa3dgl_context *_ctx = (struct mesa3dgl_context *)ctx; - switch(amesa->stvis.depth_stencil_format) + switch(_ctx->stvis.depth_stencil_format) { case(PIPE_FORMAT_S8_USCALED_Z24_UNORM): depthbits = 24; stencilbits = 8; break; case(PIPE_FORMAT_X8Z24_UNORM): depthbits = 24; stencilbits = 0; break; @@ -51,20 +53,20 @@ default: depthbits = -1; stencilbits = -1; } - switch(amesa->stvis.accum_format) + switch(_ctx->stvis.accum_format) { case(PIPE_FORMAT_R16G16B16A16_SNORM): accumbits = 16; break; default: accumbits = -1; } - switch(amesa->stvis.color_format) + switch(_ctx->stvis.color_format) { case(PIPE_FORMAT_B5G6R5_UNORM): rbbits = 5; gbits = 6; abits = 0; break; case(PIPE_FORMAT_B8G8R8A8_UNORM): rbbits = 8; gbits = 8; abits = 8; break; default: rbbits = -1; gbits = -1; abits = 1; } - if (amesa) + if (_ctx) { switch(pname) { diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glagetcurrentcontext.c b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glagetcurrentcontext.c similarity index 85% rename from workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glagetcurrentcontext.c rename to workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glagetcurrentcontext.c index 857df2c386..19710d5fd9 100644 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glagetcurrentcontext.c +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glagetcurrentcontext.c @@ -1,11 +1,12 @@ /* - Copyright 2009-2014, The AROS Development Team. All rights reserved. + Copyright 2009-2015, The AROS Development Team. All rights reserved. $Id$ */ -#include "arosmesa_funcs.h" #include +#include "mesa3dgl_types.h" + /***************************************************************************** NAME */ diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glagetprocaddress.c b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glagetprocaddress.c similarity index 83% rename from workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glagetprocaddress.c rename to workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glagetprocaddress.c index 0a5c124d05..99c57d3815 100644 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glagetprocaddress.c +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glagetprocaddress.c @@ -1,11 +1,12 @@ /* - Copyright 2014, The AROS Development Team. All rights reserved. + Copyright 2014-2015, The AROS Development Team. All rights reserved. $Id$ */ -#include "arosmesa_types.h" #include +#include "mesa3dgl_types.h" + /***************************************************************************** NAME */ diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glamakecurrent.c b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glamakecurrent.c similarity index 58% rename from workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glamakecurrent.c rename to workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glamakecurrent.c index 1f3212538c..c33832f28c 100644 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glamakecurrent.c +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glamakecurrent.c @@ -1,11 +1,13 @@ /* - Copyright 2009-2014, The AROS Development Team. All rights reserved. + Copyright 2009-2015, The AROS Development Team. All rights reserved. $Id$ */ -#include "arosmesa_funcs.h" #include +#include "mesa3dgl_types.h" +#include "mesa3dgl_funcs.h" + /***************************************************************************** NAME */ @@ -19,7 +21,7 @@ Make the selected GL rendering context active. INPUTS - amesa - GL rendering context to be made active for all following GL + ctx - GL rendering context to be made active for all following GL calls. RESULT @@ -32,21 +34,21 @@ *****************************************************************************/ { - struct arosmesa_context * amesa = (struct arosmesa_context *)ctx; + struct mesa3dgl_context *_ctx = (struct mesa3dgl_context *)ctx; - if (amesa) + if (_ctx) { struct st_context_iface * cur_ctx = glstapi->get_current(glstapi); - - if (amesa->st != cur_ctx) + + if (_ctx->st != cur_ctx) { /* Recalculate buffer dimensions */ - AROSMesaRecalculateBufferWidthHeight(amesa); + MESA3DGLRecalculateBufferWidthHeight(_ctx); /* Attach */ - glstapi->make_current(glstapi, amesa->st, - &amesa->framebuffer->base, &amesa->framebuffer->base); - } + glstapi->make_current(glstapi, _ctx->st, + &_ctx->framebuffer->base, &_ctx->framebuffer->base); + } } else { diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glasetrast.c b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glasetrast.c similarity index 74% rename from workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glasetrast.c rename to workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glasetrast.c index 2853dd8fa8..ec44df8fbb 100644 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glasetrast.c +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glasetrast.c @@ -1,14 +1,17 @@ /* - Copyright 2011-2014, The AROS Development Team. All rights reserved. + Copyright 2011-2015, The AROS Development Team. All rights reserved. $Id$ */ -#include "arosmesa_funcs.h" -#include "arosmesa_funcs_gallium.h" +#define DEBUG 1 +#include + #include #include #include -#include + +#include "mesa3dgl_funcs.h" +#include "mesa3dgl_gallium.h" /***************************************************************************** @@ -26,6 +29,7 @@ INPUTS + ctx - tagList - a pointer to tags to be used during creation. TAGS @@ -45,9 +49,9 @@ *****************************************************************************/ { - struct arosmesa_context * amesa = (struct arosmesa_context *)ctx; + struct mesa3dgl_context * _ctx = (struct mesa3dgl_context *)ctx; - if (amesa) + if (_ctx) { /* Check if at least one of window, rastport or screen have been passed */ if ((GetTagData(GLA_Screen, 0, tagList) != 0) || @@ -55,18 +59,18 @@ (GetTagData(GLA_RastPort, 0, tagList) != 0)) { /* If there already is visible_rp, free it */ - if (amesa->visible_rp) - FreeRastPort(amesa->visible_rp); + if (_ctx->visible_rp) + FreeRastPort(_ctx->visible_rp); /* Do standard rast port selection */ - AROSMesaSelectRastPort(amesa, tagList); + MESA3DGLSelectRastPort(_ctx, tagList); /* Do standard initialization */ - AROSMesaStandardInit(amesa, tagList); + MESA3DGLStandardInit(_ctx, tagList); /* TODO: what to do with visual and framebuffer, if BPP changes, we are in trouble */ /* After the new render target has been attached, invoke framebuffer recalculation */ - AROSMesaCheckAndUpdateBufferSize(amesa); + MESA3DGLCheckAndUpdateBufferSize(_ctx); } } } diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glaswapbuffers.c b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glaswapbuffers.c similarity index 53% rename from workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glaswapbuffers.c rename to workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glaswapbuffers.c index 11b31a7812..a059ab6f1a 100644 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/glaswapbuffers.c +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_glaswapbuffers.c @@ -1,15 +1,19 @@ /* - Copyright 2009-2014, The AROS Development Team. All rights reserved. + Copyright 2009-2015, The AROS Development Team. All rights reserved. $Id$ */ -#include "arosmesa_funcs.h" -#include "arosmesa_funcs_gallium.h" #include #include + #include #include +#include "mesa3dgl_types.h" +#include "mesa3dgl_funcs.h" +#include "mesa3dgl_gallium.h" + + /***************************************************************************** NAME */ @@ -25,7 +29,7 @@ double buffer mode. INPUTS - amesa - GL rendering context on which swap is to be performed. + ctx - GL rendering context on which swap is to be performed. RESULT @@ -37,17 +41,17 @@ *****************************************************************************/ { - struct arosmesa_context * amesa = (struct arosmesa_context *)ctx; + struct mesa3dgl_context *_ctx = (struct mesa3dgl_context *)ctx; - if (amesa->framebuffer->render_resource) + if (_ctx->framebuffer->render_resource) { /* Flush rendering cache before blitting */ - amesa->st->flush(amesa->st, ST_FLUSH_FRONT, NULL); + _ctx->st->flush(_ctx->st, ST_FLUSH_FRONT, NULL); - BltPipeResourceRastPort(amesa->framebuffer->render_resource, 0, 0, - amesa->visible_rp, amesa->left, amesa->top, - amesa->framebuffer->width, amesa->framebuffer->height); + BltPipeResourceRastPort(_ctx->framebuffer->render_resource, 0, 0, + _ctx->visible_rp, _ctx->left, _ctx->top, + _ctx->framebuffer->width, _ctx->framebuffer->height); } - AROSMesaCheckAndUpdateBufferSize(amesa); + MESA3DGLCheckAndUpdateBufferSize(_ctx); } diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_init.c b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_init.c similarity index 69% rename from workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_init.c rename to workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_init.c index f89c41e199..2e05c5fa40 100644 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_init.c +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_init.c @@ -1,5 +1,5 @@ /* - Copyright 2010, The AROS Development Team. All rights reserved. + Copyright 2010-2015, The AROS Development Team. All rights reserved. $Id$ */ @@ -12,7 +12,7 @@ /* TODO: Should be moved to LIBBASE */ struct st_api * glstapi; -LONG AROSMesaInit() +LONG MESA3DGLInit() { glstapi = st_gl_api_create(); if (glstapi) @@ -22,11 +22,11 @@ LONG AROSMesaInit() } -VOID AROSMesaExit() +VOID MESA3DGLExit() { if (glstapi) glstapi->destroy(glstapi); } -ADD2INIT(AROSMesaInit, 5); -ADD2EXIT(AROSMesaExit, 5); +ADD2INIT(MESA3DGLInit, 5); +ADD2EXIT(MESA3DGLExit, 5); diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs.c b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_support.c similarity index 76% rename from workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs.c rename to workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_support.c index 8ac1290ee8..61cf584b7c 100644 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs.c +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_support.c @@ -1,18 +1,21 @@ /* - Copyright 2009-2014, The AROS Development Team. All rights reserved. + Copyright 2009-2015, The AROS Development Team. All rights reserved. $Id$ */ -#include "arosmesa_funcs.h" +#include + #include #include #include #include + #include #include -#include -VOID AROSMesaSelectRastPort(struct arosmesa_context * amesa, struct TagItem * tagList) +#include "mesa3dgl_funcs.h" + +VOID MESA3DGLSelectRastPort(struct mesa3dgl_context * amesa, struct TagItem * tagList) { amesa->Screen = (struct Screen *)GetTagData(GLA_Screen, 0, tagList); amesa->window = (struct Window *)GetTagData(GLA_Window, 0, tagList); @@ -20,15 +23,15 @@ VOID AROSMesaSelectRastPort(struct arosmesa_context * amesa, struct TagItem * ta if (amesa->Screen) { - D(bug("[AROSMESA] AROSMesaSelectRastPort: Screen @ %x\n", amesa->Screen)); + D(bug("[MESA3DGL] MESA3DGLSelectRastPort: Screen @ %x\n", amesa->Screen)); if (amesa->window) { - D(bug("[AROSMESA] AROSMesaSelectRastPort: Window @ %x\n", amesa->window)); + D(bug("[MESA3DGL] MESA3DGLSelectRastPort: Window @ %x\n", amesa->window)); if (!(amesa->visible_rp)) { /* Use the windows rastport */ amesa->visible_rp = amesa->window->RPort; - D(bug("[AROSMESA] AROSMesaSelectRastPort: Windows RastPort @ %x\n", amesa->visible_rp)); + D(bug("[MESA3DGL] MESA3DGLSelectRastPort: Windows RastPort @ %x\n", amesa->visible_rp)); } } else @@ -37,7 +40,7 @@ VOID AROSMesaSelectRastPort(struct arosmesa_context * amesa, struct TagItem * ta { /* Use the screens rastport */ amesa->visible_rp = &amesa->Screen->RastPort; - D(bug("[AROSMESA] AROSMesaSelectRastPort: Screens RastPort @ %x\n", amesa->visible_rp)); + D(bug("[MESA3DGL] MESA3DGLSelectRastPort: Screens RastPort @ %x\n", amesa->visible_rp)); } } } @@ -46,29 +49,29 @@ VOID AROSMesaSelectRastPort(struct arosmesa_context * amesa, struct TagItem * ta /* Not passed a screen */ if (amesa->window) { - D(bug("[AROSMESA] AROSMesaSelectRastPort: Window @ %x\n", amesa->window)); + D(bug("[MESA3DGL] MESA3DGLSelectRastPort: Window @ %x\n", amesa->window)); /* Use the windows Screen */ amesa->Screen = amesa->window->WScreen; - D(bug("[AROSMESA] AROSMesaSelectRastPort: Windows Screen @ %x\n", amesa->Screen)); + D(bug("[MESA3DGL] MESA3DGLSelectRastPort: Windows Screen @ %x\n", amesa->Screen)); if (!(amesa->visible_rp)) { /* Use the windows rastport */ amesa->visible_rp = amesa->window->RPort; - D(bug("[AROSMESA] AROSMesaSelectRastPort: Windows RastPort @ %x\n", amesa->visible_rp)); + D(bug("[MESA3DGL] MESA3DGLSelectRastPort: Windows RastPort @ %x\n", amesa->visible_rp)); } } else { /* Only Passed A Rastport */ - D(bug("[AROSMESA] AROSMesaSelectRastPort: Using RastPort only!\n")); + D(bug("[MESA3DGL] MESA3DGLSelectRastPort: Using RastPort only!\n")); } } - D(bug("[AROSMESA] AROSMesaSelectRastPort: Using RastPort @ %x\n", amesa->visible_rp)); + D(bug("[MESA3DGL] MESA3DGLSelectRastPort: Using RastPort @ %x\n", amesa->visible_rp)); } -BOOL AROSMesaStandardInit(struct arosmesa_context * amesa, struct TagItem *tagList) +BOOL MESA3DGLStandardInit(struct mesa3dgl_context * amesa, struct TagItem *tagList) { LONG requestedwidth = 0, requestedheight = 0; LONG requestedright = 0, requestedbottom = 0; @@ -87,12 +90,12 @@ BOOL AROSMesaStandardInit(struct arosmesa_context * amesa, struct TagItem *tagLi } } - D(bug("[AROSMESA] AROSMesaStandardInit(amesa @ %x, taglist @ %x)\n", amesa, tagList)); - D(bug("[AROSMESA] AROSMesaStandardInit: Using RastPort @ %x\n", amesa->visible_rp)); + D(bug("[MESA3DGL] MESA3DGLStandardInit(amesa @ %x, taglist @ %x)\n", amesa, tagList)); + D(bug("[MESA3DGL] MESA3DGLStandardInit: Using RastPort @ %x\n", amesa->visible_rp)); amesa->visible_rp = CloneRastPort(amesa->visible_rp); - D(bug("[AROSMESA] AROSMesaStandardInit: Cloned RastPort @ %x\n", amesa->visible_rp)); + D(bug("[MESA3DGL] MESA3DGLStandardInit: Cloned RastPort @ %x\n", amesa->visible_rp)); /* We assume left and top are given or if there is a window, set to border left/top or if there is no window set to 0 */ @@ -143,23 +146,23 @@ BOOL AROSMesaStandardInit(struct arosmesa_context * amesa, struct TagItem *tagLi if (amesa->Screen) amesa->BitsPerPixel = GetCyberMapAttr(amesa->Screen->RastPort.BitMap, CYBRMATTR_BPPIX) * 8; - D(bug("[AROSMESA] AROSMesaStandardInit: Context Base dimensions set -:\n")); - D(bug("[AROSMESA] AROSMesaStandardInit: amesa->visible_rp_width = %d\n", amesa->visible_rp_width)); - D(bug("[AROSMESA] AROSMesaStandardInit: amesa->visible_rp_height = %d\n", amesa->visible_rp_height)); - D(bug("[AROSMESA] AROSMesaStandardInit: amesa->left = %d\n", amesa->left)); - D(bug("[AROSMESA] AROSMesaStandardInit: amesa->right = %d\n", amesa->right)); - D(bug("[AROSMESA] AROSMesaStandardInit: amesa->top = %d\n", amesa->top)); - D(bug("[AROSMESA] AROSMesaStandardInit: amesa->bottom = %d\n", amesa->bottom)); + D(bug("[MESA3DGL] MESA3DGLStandardInit: Context Base dimensions set -:\n")); + D(bug("[MESA3DGL] MESA3DGLStandardInit: amesa->visible_rp_width = %d\n", amesa->visible_rp_width)); + D(bug("[MESA3DGL] MESA3DGLStandardInit: amesa->visible_rp_height = %d\n", amesa->visible_rp_height)); + D(bug("[MESA3DGL] MESA3DGLStandardInit: amesa->left = %d\n", amesa->left)); + D(bug("[MESA3DGL] MESA3DGLStandardInit: amesa->right = %d\n", amesa->right)); + D(bug("[MESA3DGL] MESA3DGLStandardInit: amesa->top = %d\n", amesa->top)); + D(bug("[MESA3DGL] MESA3DGLStandardInit: amesa->bottom = %d\n", amesa->bottom)); return TRUE; } -VOID AROSMesaRecalculateBufferWidthHeight(struct arosmesa_context * amesa) +VOID MESA3DGLRecalculateBufferWidthHeight(struct mesa3dgl_context * amesa) { ULONG newwidth = 0; ULONG newheight = 0; - D(bug("[AROSMESA] AROSMesaRecalculateBufferWidthHeight\n")); + D(bug("[MESA3DGL] MESA3DGLRecalculateBufferWidthHeight\n")); amesa->visible_rp_width = @@ -179,10 +182,10 @@ VOID AROSMesaRecalculateBufferWidthHeight(struct arosmesa_context * amesa) if ((newwidth != amesa->framebuffer->width) || (newheight != amesa->framebuffer->height)) { /* The drawing area size has changed. Buffer must change */ - D(bug("[AROSMESA] AROSMesaRecalculateBufferWidthHeight: current height = %d\n", amesa->framebuffer->height)); - D(bug("[AROSMESA] AROSMesaRecalculateBufferWidthHeight: current width = %d\n", amesa->framebuffer->width)); - D(bug("[AROSMESA] AROSMesaRecalculateBufferWidthHeight: new height = %d\n", newheight)); - D(bug("[AROSMESA] AROSMesaRecalculateBufferWidthHeight: new width = %d\n", newwidth)); + D(bug("[MESA3DGL] MESA3DGLRecalculateBufferWidthHeight: current height = %d\n", amesa->framebuffer->height)); + D(bug("[MESA3DGL] MESA3DGLRecalculateBufferWidthHeight: current width = %d\n", amesa->framebuffer->width)); + D(bug("[MESA3DGL] MESA3DGLRecalculateBufferWidthHeight: new height = %d\n", newheight)); + D(bug("[MESA3DGL] MESA3DGLRecalculateBufferWidthHeight: new width = %d\n", newwidth)); amesa->framebuffer->width = newwidth; amesa->framebuffer->height = newheight; @@ -198,7 +201,7 @@ VOID AROSMesaRecalculateBufferWidthHeight(struct arosmesa_context * amesa) { TAG_DONE } }; - D(bug("[AROSMESA] AROSMesaRecalculateBufferWidthHeight: Clipping Rastport to Window's dimensions\n")); + D(bug("[MESA3DGL] MESA3DGLRecalculateBufferWidthHeight: Clipping Rastport to Window's dimensions\n")); /* Clip the rastport to the visible area */ rastcliprect.MinX = amesa->left; @@ -210,7 +213,7 @@ VOID AROSMesaRecalculateBufferWidthHeight(struct arosmesa_context * amesa) } } -VOID AROSMesaFreeContext(struct arosmesa_context * amesa) +VOID MESA3DGLFreeContext(struct mesa3dgl_context * amesa) { if (amesa) { diff --git a/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_support.h b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_support.h new file mode 100644 index 0000000000..8ed512c22b --- /dev/null +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_support.h @@ -0,0 +1,16 @@ +/* + Copyright 2009-2015, The AROS Development Team. All rights reserved. + $Id$ +*/ + +#ifndef MESA3DGL_SUPPORT_H +#define MESA3DGL_SUPPORT_H + +#include "mesa3dgl_types.h" + +VOID MESA3DGLSelectRastPort(struct mesa3dgl_context * amesa, struct TagItem * tagList); +BOOL MESA3DGLStandardInit(struct mesa3dgl_context * amesa, struct TagItem *tagList); +VOID MESA3DGLRecalculateBufferWidthHeight(struct mesa3dgl_context * amesa); +VOID MESA3DGLFreeContext(struct mesa3dgl_context * amesa); + +#endif /* MESA3DGL_SUPPORT_H */ diff --git a/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_types.h b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_types.h new file mode 100644 index 0000000000..baca0f52d3 --- /dev/null +++ b/workbench/libs/mesa/src/aros/arosmesa/mesa3dgl_types.h @@ -0,0 +1,49 @@ +/* + Copyright 2009-2015, The AROS Development Team. All rights reserved. + $Id$ +*/ + +#ifndef MESA3DGL_TYPES_H +#define MESA3DGL_TYPES_H + +#include +#include "main/mtypes.h" +#include "state_tracker/st_api.h" + +struct mesa3dgl_framebuffer +{ + struct st_framebuffer_iface base; + struct st_visual stvis; + + struct pipe_screen *screen; + struct pipe_resource *textures[ST_ATTACHMENT_COUNT]; + struct pipe_resource *render_resource; /* Resource with results of rendering (back buffer) */ + + ULONG width; + ULONG height; + BOOL resized; +}; + +/* mesa/gallium GL context */ +struct mesa3dgl_context +{ + struct st_context_iface *st; + struct st_visual stvis; + struct st_manager *stmanager; + + struct mesa3dgl_framebuffer *framebuffer; + struct Window *window; + struct Screen *Screen; + ULONG BitsPerPixel; + struct RastPort *visible_rp; + ULONG visible_rp_width; + ULONG visible_rp_height; + ULONG top, bottom; + ULONG left, right; + +}; + +/* state trackers GL API */ +extern struct st_api * glstapi; + +#endif /* MESA3DGL_TYPES_H */ diff --git a/workbench/libs/mesa/src/aros/arosmesa/mmakefile.src b/workbench/libs/mesa/src/aros/arosmesa/mmakefile.src index 2e2a4c4475..e19ef6bbbe 100644 --- a/workbench/libs/mesa/src/aros/arosmesa/mmakefile.src +++ b/workbench/libs/mesa/src/aros/arosmesa/mmakefile.src @@ -18,19 +18,19 @@ SHARED_LIB_SOURCES = \ aros/emul_arosc \ aros/tls \ -AROSMESA_SOURCES = \ - gallium/state_trackers/arosmesa/arosmesa_funcs \ - gallium/state_trackers/arosmesa/arosmesa_funcs_gallium \ - gallium/state_trackers/arosmesa/arosmesa_init \ - gallium/state_trackers/arosmesa/getopenglstatetrackerapi \ - gallium/state_trackers/arosmesa/glacreatecontext \ - gallium/state_trackers/arosmesa/gladestroycontext \ - gallium/state_trackers/arosmesa/glagetconfig \ - gallium/state_trackers/arosmesa/glagetcurrentcontext \ - gallium/state_trackers/arosmesa/glagetprocaddress \ - gallium/state_trackers/arosmesa/glamakecurrent \ - gallium/state_trackers/arosmesa/glasetrast \ - gallium/state_trackers/arosmesa/glaswapbuffers \ +MESA3DGL_SOURCES = \ + aros/arosmesa/mesa3dgl_support \ + aros/arosmesa/mesa3dgl_gallium \ + aros/arosmesa/mesa3dgl_init \ + aros/arosmesa/mesa3dgl_getopenglstatetrackerapi \ + aros/arosmesa/mesa3dgl_glacreatecontext \ + aros/arosmesa/mesa3dgl_gladestroycontext \ + aros/arosmesa/mesa3dgl_glagetconfig \ + aros/arosmesa/mesa3dgl_glagetcurrentcontext \ + aros/arosmesa/mesa3dgl_glagetprocaddress \ + aros/arosmesa/mesa3dgl_glamakecurrent \ + aros/arosmesa/mesa3dgl_glasetrast \ + aros/arosmesa/mesa3dgl_glaswapbuffers \ GLSL_LIBGLCPP_SOURCES = \ glcpp/glcpp-lex.c \ @@ -123,10 +123,9 @@ USER_INCLUDES := \ -I$(SRCDIR)/$(CURDIR)/../.. \ USER_CFLAGS := -ffast-math -DMAPI_MODE_UTIL -DFEATURE_GL=1 \ - -DAROSMESA_TYPES='"arosmesa_types.h"' \ -DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\" -LIB_MESA_SOURCES = \ +MESAGL_CORE_SOURCES = \ $(addprefix mesa/, $(MESA_GALLIUM_SOURCES:.c=)) \ $(addprefix mapi/mapi/, $(MAPI_UTIL_SOURCES:.c=)) \ $(addprefix mapi/glapi/, $(GLAPI_SOURCES:.c=)) \ @@ -141,14 +140,14 @@ CXX_SOURCES := \ ../../aros/emul_cpp \ LIBRARY_SOURCES = \ - $(addprefix ../../, $(LIB_MESA_SOURCES)) \ - $(addprefix ../../, $(AROSMESA_SOURCES)) \ + $(addprefix ../../, $(MESAGL_CORE_SOURCES)) \ + $(addprefix ../../, $(MESA3DGL_SOURCES)) \ $(addprefix ../../, $(SHARED_LIB_SOURCES)) # #MM- core-linklibs : linklibs-mesa %build_module_library mmake=workbench-libs-mesa \ - modname=mesa3dgl modtype=library conffile=gl.conf \ + modname=mesa3dgl modtype=library conffile=$(SRCDIR)/workbench/libs/gl/gl.conf \ files="$(LIBRARY_SOURCES)" cxxfiles="$(CXX_SOURCES)" \ uselibs="galliumauxiliary gallium stdcio stdc" diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs.h b/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs.h deleted file mode 100644 index 22b692af65..0000000000 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - Copyright 2009-2014, The AROS Development Team. All rights reserved. - $Id$ -*/ - -#ifndef AROSMESA_FUNCS_H -#define AROSMESA_FUNCS_H - -#include AROSMESA_TYPES - -VOID AROSMesaSelectRastPort(struct arosmesa_context * amesa, struct TagItem * tagList); -BOOL AROSMesaStandardInit(struct arosmesa_context * amesa, struct TagItem *tagList); -VOID AROSMesaRecalculateBufferWidthHeight(struct arosmesa_context * amesa); -VOID AROSMesaFreeContext(struct arosmesa_context * amesa); -#endif diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs_gallium.h b/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs_gallium.h deleted file mode 100644 index fa2342abcc..0000000000 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_funcs_gallium.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - Copyright 2009-2014, The AROS Development Team. All rights reserved. - $Id$ -*/ - -#ifndef AROSMESA_FUNCS_GALLIUM_H -#define AROSMESA_FUNCS_GALLIUM_H - -#include "arosmesa_types.h" - -BOOL AROSMesaFillVisual(struct st_visual * stvis, struct pipe_screen * screen, GLint bpp, struct TagItem *tagList); -struct arosmesa_framebuffer * AROSMesaNewFrameBuffer(struct arosmesa_context * amesa, struct st_visual * stvis); -VOID AROSMesaFreeFrameBuffer(struct arosmesa_framebuffer * framebuffer); -VOID AROSMesaCheckAndUpdateBufferSize(struct arosmesa_context * amesa); -struct st_manager * AROSMesaNewStManager(); -VOID AROSMesaFreeStManager(struct st_manager * stmanager); -#endif diff --git a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_types.h b/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_types.h deleted file mode 100644 index 59c4dc877e..0000000000 --- a/workbench/libs/mesa/src/gallium/state_trackers/arosmesa/arosmesa_types.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - Copyright 2009-2010, The AROS Development Team. All rights reserved. - $Id$ -*/ - -#ifndef AROSMESA_TYPES_H -#define AROSMESA_TYPES_H - -#include -#include "main/mtypes.h" -#include "state_tracker/st_api.h" - -struct arosmesa_framebuffer -{ - struct st_framebuffer_iface base; - struct st_visual stvis; - - struct pipe_screen *screen; - struct pipe_resource *textures[ST_ATTACHMENT_COUNT]; - struct pipe_resource *render_resource; /* Resource with results of rendering (back buffer) */ - ULONG width; - ULONG height; - BOOL resized; -}; - -/* AROSMesa context */ -struct arosmesa_context -{ - struct st_context_iface *st; - struct st_visual stvis; - struct st_manager *stmanager; - - struct arosmesa_framebuffer *framebuffer; - - struct Window *window; /* Intuition window */ - struct Screen *Screen; - ULONG BitsPerPixel; - - /* Rastport 'visible' to user (window rasport, screen rastport)*/ - struct RastPort *visible_rp; - /* Rastport dimentions */ - ULONG visible_rp_width; /* the rastport drawing area full size*/ - ULONG visible_rp_height; /* the rastport drawing area full size*/ - - /* Buffer information */ - ULONG top, bottom; /* offsets due to window border */ - ULONG left, right; /* offsets due to window border */ -}; - -/* GL API for state tracker */ -extern struct st_api * glstapi; - -#endif /* AROSMESA_TYPES_H */ -- 2.11.4.GIT