Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Mesa
piglit
Commits
8ba08940
Commit
8ba08940
authored
May 31, 2008
by
Nicolai Hähnle
Browse files
glean/tapi2: Do not cast string constants to char*
parent
0b74a679
Changes
2
Hide whitespace changes
Inline
Side-by-side
tests/glean/tapi2.cpp
View file @
8ba08940
// BEGIN_COPYRIGHT -*- glean -*-
//
//
// Copyright (C) 1999 Allen Akin 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
...
...
@@ -10,11 +10,11 @@
// 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 and this permission notice 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
...
...
@@ -23,7 +23,7 @@
// 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.
//
//
// END_COPYRIGHT
// tapi2.h: Test OpenGL 2.x API functions/features
...
...
@@ -104,7 +104,7 @@ static PFNGLDRAWBUFFERSPROC glDrawBuffers_func = NULL;
// \param errorFunc returns name of API function in case of error
// \return true for success, false for error
bool
API2Test
::
getFunctions_2_0
(
char
**
errorFunc
)
API2Test
::
getFunctions_2_0
(
const
char
**
errorFunc
)
{
#define GET(PTR, TYPE, STR) \
PTR = (TYPE) GLUtils::getProcAddress(STR); \
...
...
@@ -187,7 +187,7 @@ API2Test::setup(void)
return
false
;
}
char
*
errorFunc
;
const
char
*
errorFunc
;
if
(
!
getFunctions_2_0
(
&
errorFunc
))
{
env
->
log
<<
"Unable to get pointer to OpenGL 2.0 function '"
<<
errorFunc
...
...
@@ -205,7 +205,7 @@ API2Test::setup(void)
glMatrixMode
(
GL_MODELVIEW
);
glLoadIdentity
();
glDrawBuffer
(
GL_FRONT
);
glReadBuffer
(
GL_FRONT
);
glReadBuffer
(
GL_FRONT
);
// compute error tolerances (may need fine-tuning)
int
bufferBits
[
5
];
...
...
tests/glean/tapi2.h
View file @
8ba08940
// BEGIN_COPYRIGHT -*- glean -*-
//
//
// Copyright (C) 1999 Allen Akin 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
...
...
@@ -10,11 +10,11 @@
// 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 and this permission notice 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
...
...
@@ -23,7 +23,7 @@
// 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.
//
//
// END_COPYRIGHT
// tapi2.h: Test OpenGL 2.x API functions/features
...
...
@@ -54,7 +54,7 @@ private:
typedef
bool
(
API2Test
::*
TestFunc
)(
void
);
GLfloat
tolerance
[
5
];
bool
getFunctions_2_0
(
char
**
errorFunc
);
bool
getFunctions_2_0
(
const
char
**
errorFunc
);
GLuint
loadAndCompileShader
(
GLenum
target
,
const
char
*
str
);
GLuint
createProgram
(
GLuint
vertShader
,
GLuint
fragShader
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment