Fix compile errors.
Bug 18621031
Change-Id: I50cf26dd3f78a9a21839118faf8f99ff88de8a36
Reviewed-on: https://swiftshader-review.googlesource.com/1591
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Radiance/common/debug.h b/src/Radiance/common/debug.h
index 492477a..08ef14a 100644
--- a/src/Radiance/common/debug.h
+++ b/src/Radiance/common/debug.h
@@ -31,21 +31,21 @@
#if defined(ANGLE_DISABLE_TRACE)
#define TRACE(message, ...) (void(0))
#else
-#define TRACE(message, ...) es::trace("trace: %s(%d): "message"\n", __FUNCTION__, __LINE__, ##__VA_ARGS__)
+#define TRACE(message, ...) es::trace("trace: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__)
#endif
// A macro to output a function call and its arguments to the debugging log, to denote an item in need of fixing.
#if defined(ANGLE_DISABLE_TRACE)
#define FIXME(message, ...) (void(0))
#else
-#define FIXME(message, ...) do {es::trace("fixme: %s(%d): "message"\n", __FUNCTION__, __LINE__, ##__VA_ARGS__); assert(false);} while(false)
+#define FIXME(message, ...) do {es::trace("fixme: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__); assert(false);} while(false)
#endif
// A macro to output a function call and its arguments to the debugging log, in case of error.
#if defined(ANGLE_DISABLE_TRACE)
#define ERR(message, ...) (void(0))
#else
-#define ERR(message, ...) do {es::trace("err: %s(%d): "message"\n", __FUNCTION__, __LINE__, ##__VA_ARGS__); assert(false);} while(false)
+#define ERR(message, ...) do {es::trace("err: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__); assert(false);} while(false)
#endif
// A macro asserting a condition and outputting failures to the debug log
diff --git a/src/Radiance/libEGL/Image.hpp b/src/Radiance/libEGL/Image.hpp
index 2ca4525..6cadef9 100644
--- a/src/Radiance/libEGL/Image.hpp
+++ b/src/Radiance/libEGL/Image.hpp
@@ -38,12 +38,12 @@
return height;
}
- GLenum Image::getFormat()
+ GLenum getFormat()
{
return format;
}
- GLenum Image::getType()
+ GLenum getType()
{
return type;
}
@@ -58,27 +58,27 @@
return multiSampleDepth;
}
- bool Image::isShared() const
+ bool isShared() const
{
return shared;
}
- void Image::markShared()
+ void markShared()
{
shared = true;
}
- void *Image::lock(unsigned int left, unsigned int top, sw::Lock lock)
+ void *lock(unsigned int left, unsigned int top, sw::Lock lock)
{
return lockExternal(left, top, 0, lock, sw::PUBLIC);
}
- unsigned int Image::getPitch() const
+ unsigned int getPitch() const
{
return getExternalPitchB();
}
- void Image::unlock()
+ void unlock()
{
unlockExternal();
}
diff --git a/src/Radiance/libEGL/libEGL.cpp b/src/Radiance/libEGL/libEGL.cpp
index 7367acd..6aec214 100644
--- a/src/Radiance/libEGL/libEGL.cpp
+++ b/src/Radiance/libEGL/libEGL.cpp
@@ -196,7 +196,7 @@
case EGL_VENDOR:
return success("TransGaming Inc.");
case EGL_VERSION:
- return success("1.4 SwiftShader "VERSION_STRING);
+ return success("1.4 SwiftShader " VERSION_STRING);
}
return error(EGL_BAD_PARAMETER, (const char*)NULL);
@@ -683,7 +683,7 @@
}
}
}
-
+
egl::Display *display = static_cast<egl::Display*>(dpy);
if(!validateConfig(display, config))
@@ -984,7 +984,7 @@
__eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const char *procname)
{
TRACE("(const char *procname = \"%s\")", procname);
-
+
if(rad::getProcAddress != 0)
{
__eglMustCastToProperFunctionPointerType proc = rad::getProcAddress(procname);
diff --git a/src/Radiance/libRAD/libRAD.cpp b/src/Radiance/libRAD/libRAD.cpp
index 6043e48..9402e66 100644
--- a/src/Radiance/libRAD/libRAD.cpp
+++ b/src/Radiance/libRAD/libRAD.cpp
@@ -183,14 +183,14 @@
public:
Sampler(Device *device) : Object(device)
{
- default();
+ defaults();
}
virtual ~Sampler()
{
}
- void default()
+ void defaults()
{
minFilter = RAD_MIN_FILTER_NEAREST_MIPMAP_LINEAR; // FIXME: default?
magFilter = RAD_MAG_FILTER_LINEAR; // FIXME: default?
@@ -236,7 +236,7 @@
{
TextureSampler(Texture *texture, Sampler *sampler, RADtextureTarget target, RADinternalFormat internalFormat, RADuint minLevel, RADuint numLevels, RADuint minLayer, RADuint numLayers);
- virtual TextureSampler::~TextureSampler();
+ virtual ~TextureSampler();
Texture *texture;
Sampler *sampler;
@@ -345,16 +345,16 @@
{
ColorState(Device *device) : Object(device)
{
- default();
+ defaults();
}
- void default()
+ void defaults()
{
enable = RAD_FALSE;
for(size_t i = 0; i < arraySize(blend); i++)
{
- blend[i].default();
+ blend[i].defaults();
}
numTargets = 1;
@@ -373,10 +373,10 @@
{
Blend()
{
- default();
+ defaults();
}
- void default()
+ void defaults()
{
enable = RAD_FALSE;
srcFunc = RAD_BLEND_FUNC_ONE;
@@ -414,10 +414,10 @@
{
RasterState(Device *device) : Object(device)
{
- default();
+ defaults();
}
- void default()
+ void defaults()
{
pointSize = 1.0f;
lineWidth = 1.0f;
@@ -459,10 +459,10 @@
{
DepthStencilState(Device *device) : Object(device)
{
- default();
+ defaults();
}
- void default()
+ void defaults()
{
depthTestEnable = RAD_FALSE;
depthWriteEnable = RAD_FALSE;
@@ -521,19 +521,19 @@
{
VertexState(Device *device) : Object(device)
{
- default();
+ defaults();
}
- void default()
+ void defaults()
{
for(size_t i = 0; i < arraySize(attrib); i++)
{
- attrib[i].default();
+ attrib[i].defaults();
}
for(size_t i = 0; i < arraySize(binding); i++)
{
- binding[i].default();
+ binding[i].defaults();
}
}
@@ -541,10 +541,10 @@
{
Attribute()
{
- default();
+ defaults();
}
- void default()
+ void defaults()
{
enable = RAD_FALSE;
bindingIndex = 0;
@@ -570,10 +570,10 @@
{
Binding()
{
- default();
+ defaults();
}
- void default()
+ void defaults()
{
group = 0;
index = 0;
@@ -593,10 +593,10 @@
{
FormatState(Device *device) : Object(device)
{
- default();
+ defaults();
}
- void default()
+ void defaults()
{
for(size_t i = 0; i < arraySize(colorFormat); i++)
{
@@ -659,7 +659,7 @@
public:
Pass(Device *device) : Object(device)
{
- default();
+ defaults();
}
virtual ~Pass()
@@ -683,7 +683,7 @@
}
}
- void default()
+ void defaults()
{
numColors = 0;
@@ -1602,7 +1602,7 @@
void RADAPIENTRY radSamplerDefault(RADsampler sampler)
{
rad::Sampler *radSampler = reinterpret_cast<rad::Sampler*>(sampler);
- radSampler->default();
+ radSampler->defaults();
}
void RADAPIENTRY radSamplerMinMagFilter(RADsampler sampler, RADminFilter min, RADmagFilter mag)
@@ -1680,7 +1680,7 @@
void RADAPIENTRY radColorDefault(RADcolorState color)
{
rad::ColorState *colorState = reinterpret_cast<rad::ColorState*>(color);
- colorState->default();
+ colorState->defaults();
}
void RADAPIENTRY radColorBlendEnable(RADcolorState color, RADuint index, RADboolean enable)
@@ -1771,7 +1771,7 @@
void RADAPIENTRY radRasterDefault(RADrasterState raster)
{
rad::RasterState *rasterState = reinterpret_cast<rad::RasterState*>(raster);
- rasterState->default();
+ rasterState->defaults();
}
void RADAPIENTRY radRasterPointSize(RADrasterState raster, RADfloat pointSize)
@@ -1869,7 +1869,7 @@
void RADAPIENTRY radDepthStencilDefault(RADdepthStencilState depthStencil)
{
rad::DepthStencilState *depthStencilState = reinterpret_cast<rad::DepthStencilState*>(depthStencil);
- depthStencilState->default();
+ depthStencilState->defaults();
}
void RADAPIENTRY radDepthStencilDepthTestEnable(RADdepthStencilState depthStencil, RADboolean enable)
@@ -2037,7 +2037,7 @@
void RADAPIENTRY radRtFormatDefault(RADrtFormatState rtFormat)
{
rad::FormatState *formatState = reinterpret_cast<rad::FormatState*>(rtFormat);
- formatState->default();
+ formatState->defaults();
}
void RADAPIENTRY radRtFormatColorFormat(RADrtFormatState rtFormat, RADuint index, RADinternalFormat format)
@@ -2241,7 +2241,7 @@
void RADAPIENTRY radPassDefault(RADpass pass)
{
rad::Pass *radPass = reinterpret_cast<rad::Pass*>(pass);
- radPass->default();
+ radPass->defaults();
}
void RADAPIENTRY radCompilePass(RADpass pass)
diff --git a/tests/HelloRAD/src/app/rad.cpp b/tests/HelloRAD/src/app/rad.cpp
index 7a71eef..6258274 100644
--- a/tests/HelloRAD/src/app/rad.cpp
+++ b/tests/HelloRAD/src/app/rad.cpp
@@ -1,8 +1,8 @@
/******************************************************************************
- @File OGLES2HelloAPI_Windows.cpp
+ @File rad.cpp
- @Title OpenGL ES 2.0 HelloAPI Tutorial
+ @Title Radiance HelloAPI Tutorial
@Version
@@ -346,6 +346,6 @@
}
/******************************************************************************
- End of file (OGLES2HelloAPI_Windows.cpp)
+ End of file (rad.cpp)
******************************************************************************/
diff --git a/tests/HelloRAD/src/app/radexample.cpp b/tests/HelloRAD/src/app/radexample.cpp
index 660697e..bcc45bb 100644
--- a/tests/HelloRAD/src/app/radexample.cpp
+++ b/tests/HelloRAD/src/app/radexample.cpp
@@ -352,7 +352,7 @@
radQueueScissor(queue, 0, 0, offscreenWidth, offscreenHeight);
radQueueViewport(queue, 0, 0, offscreenWidth, offscreenHeight);
- RADbindGroupElement b[4] = {{vboHandle, 0, ~0}, {vboHandle, sizeof(vertexData), ~0}, {uboHandle, 0, 4*sizeof(float)}, {texHandle, 0, ~0}};
+ RADbindGroupElement b[4] = {{vboHandle, 0, 0}, {vboHandle, sizeof(vertexData), 0}, {uboHandle, 0, 4*sizeof(float)}, {texHandle, 0, 0}};
RADbuffer bindGroup = AllocAndFillBuffer(device, b, sizeof(b), RAD_BINDGROUP_ACCESS_BIT, false);
RADbindGroupHandle bindGroupHandle = radGetBindGroupHandle(bindGroup);
