mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-07 02:10:12 +01:00
Define GLX_USE_APPLEGL, as config/darwin used to, to turn on specific code to use the applegl direct renderer Convert src/glx/apple/Makefile to automake Since the applegl libGL is now built by linking libappleglx into libGL, rather than by linking selected files into a special libGL: - Remove duplicate code in apple/glxreply.c and apple/apple_glx.c. This makes apple/glxreply.c empty, so remove it - Some indirect rendering code is already guarded by !GLX_USE_APPLEGL, but we need to add those guards to indirect_glx.c, indirect_init.c (via it's generator), render2.c and vertarr.c so they don't generate anything Fix and update various includes glapi_gentable.c (which is only used on darwin), should be included in shared glapi as well, to provide _glapi_create_table_from_handle() Note that neither swrast nor indirect is supported in the APPLEGL path at the moment, which makes things more complex than they need to be. More untangling is needed to allow that v2: Correct apple/Makefile.am for srcdir != builddir Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
215 lines
7.1 KiB
C
215 lines
7.1 KiB
C
/*
|
|
* SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
|
|
* Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
|
|
*
|
|
* 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 including the dates of first publication and
|
|
* either this permission notice or a reference to
|
|
* http://oss.sgi.com/projects/FreeB/
|
|
* 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
|
|
* SILICON GRAPHICS, INC. 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.
|
|
*
|
|
* Except as contained in this notice, the name of Silicon Graphics, Inc.
|
|
* shall not be used in advertising or otherwise to promote the sale, use or
|
|
* other dealings in this Software without prior written authorization from
|
|
* Silicon Graphics, Inc.
|
|
*/
|
|
|
|
#include "glxclient.h"
|
|
#include "indirect.h"
|
|
#include "indirect_vertex_array.h"
|
|
|
|
#ifndef GLX_USE_APPLEGL
|
|
|
|
/*****************************************************************************/
|
|
|
|
/**
|
|
* \name Vertex array pointer bridge functions
|
|
*
|
|
* When EXT_vertex_array was moved into the core GL spec, the \c count
|
|
* parameter was lost. This libGL really only wants to implement the GL 1.1
|
|
* version, but we need to support applications that were written to the old
|
|
* interface. These bridge functions are part of the glue that makes this
|
|
* happen.
|
|
*/
|
|
/*@{*/
|
|
void
|
|
__indirect_glColorPointerEXT(GLint size, GLenum type, GLsizei stride,
|
|
GLsizei count, const GLvoid * pointer)
|
|
{
|
|
(void) count;
|
|
__indirect_glColorPointer(size, type, stride, pointer);
|
|
}
|
|
|
|
void
|
|
__indirect_glEdgeFlagPointerEXT(GLsizei stride,
|
|
GLsizei count, const GLboolean * pointer)
|
|
{
|
|
(void) count;
|
|
__indirect_glEdgeFlagPointer(stride, pointer);
|
|
}
|
|
|
|
void
|
|
__indirect_glIndexPointerEXT(GLenum type, GLsizei stride,
|
|
GLsizei count, const GLvoid * pointer)
|
|
{
|
|
(void) count;
|
|
__indirect_glIndexPointer(type, stride, pointer);
|
|
}
|
|
|
|
void
|
|
__indirect_glNormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
|
|
const GLvoid * pointer)
|
|
{
|
|
(void) count;
|
|
__indirect_glNormalPointer(type, stride, pointer);
|
|
}
|
|
|
|
void
|
|
__indirect_glTexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
|
|
GLsizei count, const GLvoid * pointer)
|
|
{
|
|
(void) count;
|
|
__indirect_glTexCoordPointer(size, type, stride, pointer);
|
|
}
|
|
|
|
void
|
|
__indirect_glVertexPointerEXT(GLint size, GLenum type, GLsizei stride,
|
|
GLsizei count, const GLvoid * pointer)
|
|
{
|
|
(void) count;
|
|
__indirect_glVertexPointer(size, type, stride, pointer);
|
|
}
|
|
|
|
/*@}*/
|
|
|
|
/*****************************************************************************/
|
|
|
|
void
|
|
__indirect_glInterleavedArrays(GLenum format, GLsizei stride,
|
|
const GLvoid * pointer)
|
|
{
|
|
struct glx_context *gc = __glXGetCurrentContext();
|
|
__GLXattribute *state = (__GLXattribute *) (gc->client_state_private);
|
|
|
|
#define NONE {0, 0, 0}
|
|
#define F(x) {GL_FLOAT, x, x * sizeof(GLfloat)}
|
|
#define UB4 {GL_UNSIGNED_BYTE, 4, 4 * sizeof(GLubyte)}
|
|
|
|
/* Each row in this array describes the elements of a particular
|
|
* interleaved array mode. Each column describes, in the order in which
|
|
* they appear in the interleaved arrays, one of the four possible types
|
|
* of vertex data that can appear in an interleaved array.
|
|
*/
|
|
struct
|
|
{
|
|
/**
|
|
* The enum describing the GL type, as would be passed to the
|
|
* appropriate gl*Pointer function.
|
|
*/
|
|
GLushort type;
|
|
|
|
/**
|
|
* Number of elements in the subarray, as would be passed (as the
|
|
* \c size parameter) to the appropriate gl*Pointer function.
|
|
*/
|
|
GLubyte count;
|
|
|
|
/**
|
|
* True size of a single element in the subarray, as would be passed
|
|
* (as the \c stride parameter) to the appropriate gl*Pointer
|
|
* function.
|
|
*/
|
|
GLubyte size;
|
|
}
|
|
static const modes[14][4] = {
|
|
/* texture color normal vertex */
|
|
{NONE, NONE, NONE, F(2)}, /* GL_V2F */
|
|
{NONE, NONE, NONE, F(3)}, /* GL_V3F */
|
|
{NONE, UB4, NONE, F(2)}, /* GL_C4UB_V2F */
|
|
{NONE, UB4, NONE, F(3)}, /* GL_C4UB_V3F */
|
|
{NONE, F(3), NONE, F(3)}, /* GL_C3F_V3F */
|
|
{NONE, NONE, F(3), F(3)}, /* GL_N3F_V3F */
|
|
{NONE, F(4), F(3), F(3)}, /* GL_C4F_N3F_V3F */
|
|
{F(2), NONE, NONE, F(3)}, /* GL_T2F_V3F */
|
|
{F(4), NONE, NONE, F(4)}, /* GL_T4F_V4F */
|
|
{F(2), UB4, NONE, F(3)}, /* GL_T2F_C4UB_V3F */
|
|
{F(2), F(3), NONE, F(3)}, /* GL_T2F_C3F_V3F */
|
|
{F(2), NONE, F(3), F(3)}, /* GL_T2F_N3F_V3F */
|
|
{F(2), F(4), F(3), F(3)}, /* GL_T2F_C4F_N3F_V3F */
|
|
{F(4), F(4), F(3), F(4)}, /* GL_T4F_C4F_N3F_V4F */
|
|
};
|
|
#undef NONE
|
|
#undef F
|
|
#undef UB4
|
|
|
|
GLint trueStride, size;
|
|
int offsets[4];
|
|
unsigned i;
|
|
const int idx = format - GL_V2F;
|
|
|
|
|
|
/* All valid formats are on the range [GL_V2F, GL_V2F+0x0D]. Since idx
|
|
* is just the format biased by -GL_V2F, all valid idx values are on the
|
|
* range [0, 0x0D].
|
|
*/
|
|
if ((idx < 0) || (idx > 0x0D)) {
|
|
__glXSetError(gc, GL_INVALID_ENUM);
|
|
return;
|
|
}
|
|
|
|
if (stride < 0) {
|
|
__glXSetError(gc, GL_INVALID_VALUE);
|
|
return;
|
|
}
|
|
|
|
|
|
/* If the 'count' for a subarray is non-zero, then the offset of its
|
|
* first element is at the currently accumulated 'size'.
|
|
*/
|
|
size = 0;
|
|
for (i = 0; i < 4; i++) {
|
|
offsets[i] = (modes[idx][i].count != 0) ? size : -1;
|
|
size += modes[idx][i].size;
|
|
}
|
|
|
|
trueStride = (stride == 0) ? size : stride;
|
|
|
|
__glXArrayDisableAll(state);
|
|
|
|
if (offsets[0] >= 0) {
|
|
__indirect_glEnableClientState(GL_TEXTURE_COORD_ARRAY);
|
|
__indirect_glTexCoordPointer(modes[idx][0].count, GL_FLOAT,
|
|
trueStride, (const char *) pointer);
|
|
}
|
|
if (offsets[1] >= 0) {
|
|
__indirect_glEnableClientState(GL_COLOR_ARRAY);
|
|
__indirect_glColorPointer(modes[idx][1].count, modes[idx][1].type,
|
|
trueStride,
|
|
(const char *) pointer + offsets[1]);
|
|
}
|
|
if (offsets[2] >= 0) {
|
|
__indirect_glEnableClientState(GL_NORMAL_ARRAY);
|
|
__indirect_glNormalPointer(GL_FLOAT, trueStride,
|
|
(const char *) pointer + offsets[2]);
|
|
}
|
|
__indirect_glEnableClientState(GL_VERTEX_ARRAY);
|
|
__indirect_glVertexPointer(modes[idx][3].count, GL_FLOAT,
|
|
trueStride,
|
|
(const char *) pointer + offsets[3]);
|
|
}
|
|
|
|
#endif
|