git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2277 dfc29bdd-3216-0410-991c-e03cc46cb475
parent
74b74142f2
commit
108f3333ff
|
@ -1,5 +1,7 @@
|
|||
Changes in 1.6
|
||||
|
||||
- ELL_ERROR log events are now created when shaders fail to compile or link, reported by Halan
|
||||
|
||||
- irrList now uses irrAllocator, fixed by Nox
|
||||
|
||||
- Added IGUIWindow::setDraggable and IGUIWindow::isDraggable, by Nox
|
||||
|
@ -29,7 +31,8 @@ Changes in 1.6
|
|||
- Added generic console device. You can now use Irrlicht to create and manipuate graphics on a shell where no graphics hardware
|
||||
or windowing system is available. To enable it uncomment #define _IRR_USE_CONSOLE_DEVICE_ in IrrCompileConfig.h
|
||||
- The console device can now present images from the software drivers and display them as ASCII art in the console
|
||||
- By default it replaces the default font in the skin, to prevent fonts from being huge.
|
||||
- By default it replaces the default font in the skin, to prevent fonts from being huge.
|
||||
|
||||
|
||||
Changes in 1.6 TA
|
||||
- implemented isALoadableFileFormat ( File *file ) for the Archive Loader
|
||||
|
|
|
@ -123,14 +123,14 @@ void CD3D8ShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& material
|
|||
|
||||
// set new vertex shader
|
||||
if (FAILED(pID3DDevice->SetVertexShader(VertexShader)))
|
||||
os::Printer::log("Could not set vertex shader.");
|
||||
os::Printer::log("Could not set vertex shader.", ELL_ERROR);
|
||||
}
|
||||
|
||||
// set new pixel shader
|
||||
if (PixelShader)
|
||||
{
|
||||
if (FAILED(pID3DDevice->SetPixelShader(PixelShader)))
|
||||
os::Printer::log("Could not set pixel shader.");
|
||||
os::Printer::log("Could not set pixel shader.", ELL_ERROR);
|
||||
}
|
||||
|
||||
if (BaseMaterial)
|
||||
|
@ -205,8 +205,8 @@ bool CD3D8ShaderMaterialRenderer::createPixelShader(const c8* pxsh)
|
|||
if (errors)
|
||||
{
|
||||
// print out compilation errors.
|
||||
os::Printer::log("Pixel shader compilation failed:");
|
||||
os::Printer::log((c8*)errors->GetBufferPointer());
|
||||
os::Printer::log("Pixel shader compilation failed:", ELL_ERROR);
|
||||
os::Printer::log((c8*)errors->GetBufferPointer(), ELL_ERROR);
|
||||
|
||||
if (code)
|
||||
code->Release();
|
||||
|
@ -217,7 +217,7 @@ bool CD3D8ShaderMaterialRenderer::createPixelShader(const c8* pxsh)
|
|||
|
||||
if (FAILED(pID3DDevice->CreatePixelShader((DWORD*)code->GetBufferPointer(), &PixelShader)))
|
||||
{
|
||||
os::Printer::log("Could not create pixel shader.");
|
||||
os::Printer::log("Could not create pixel shader.", ELL_ERROR);
|
||||
code->Release();
|
||||
return false;
|
||||
}
|
||||
|
@ -270,8 +270,8 @@ bool CD3D8ShaderMaterialRenderer::createVertexShader(const char* vtxsh, E_VERTEX
|
|||
if (errors)
|
||||
{
|
||||
// print out compilation errors.
|
||||
os::Printer::log("Vertex shader compilation failed:");
|
||||
os::Printer::log((c8*)errors->GetBufferPointer());
|
||||
os::Printer::log("Vertex shader compilation failed:", ELL_ERROR);
|
||||
os::Printer::log((c8*)errors->GetBufferPointer(), ELL_ERROR);
|
||||
|
||||
if (code)
|
||||
code->Release();
|
||||
|
@ -313,7 +313,7 @@ bool CD3D8ShaderMaterialRenderer::createVertexShader(const char* vtxsh, E_VERTEX
|
|||
if (FAILED(pID3DDevice->CreateVertexShader(decl,
|
||||
(DWORD*)code->GetBufferPointer(), &VertexShader, 0)))
|
||||
{
|
||||
os::Printer::log("Could not create vertex shader.");
|
||||
os::Printer::log("Could not create vertex shader.", ELL_ERROR);
|
||||
code->Release();
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -48,7 +48,7 @@ CD3D9HLSLMaterialRenderer::CD3D9HLSLMaterialRenderer(IDirect3DDevice9* d3ddev,
|
|||
|
||||
if (vsCompileTarget < 0 || vsCompileTarget > EVST_COUNT)
|
||||
{
|
||||
os::Printer::log("Invalid HLSL vertex shader compilation target");
|
||||
os::Printer::log("Invalid HLSL vertex shader compilation target", ELL_ERROR);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -131,10 +131,10 @@ bool CD3D9HLSLMaterialRenderer::createHLSLVertexShader(const char* vertexShaderP
|
|||
|
||||
if (FAILED(h))
|
||||
{
|
||||
os::Printer::log("HLSL vertex shader compilation failed:");
|
||||
os::Printer::log("HLSL vertex shader compilation failed:", ELL_ERROR);
|
||||
if (errors)
|
||||
{
|
||||
os::Printer::log((c8*)errors->GetBufferPointer());
|
||||
os::Printer::log((c8*)errors->GetBufferPointer(), ELL_ERROR);
|
||||
errors->Release();
|
||||
if (buffer)
|
||||
buffer->Release();
|
||||
|
@ -150,7 +150,7 @@ bool CD3D9HLSLMaterialRenderer::createHLSLVertexShader(const char* vertexShaderP
|
|||
if (FAILED(pID3DDevice->CreateVertexShader((DWORD*)buffer->GetBufferPointer(),
|
||||
&VertexShader)))
|
||||
{
|
||||
os::Printer::log("Could not create hlsl vertex shader.");
|
||||
os::Printer::log("Could not create hlsl vertex shader.", ELL_ERROR);
|
||||
buffer->Release();
|
||||
return false;
|
||||
}
|
||||
|
@ -218,10 +218,10 @@ bool CD3D9HLSLMaterialRenderer::createHLSLPixelShader(const char* pixelShaderPro
|
|||
|
||||
if (FAILED(h))
|
||||
{
|
||||
os::Printer::log("HLSL pixel shader compilation failed:");
|
||||
os::Printer::log("HLSL pixel shader compilation failed:", ELL_ERROR);
|
||||
if (errors)
|
||||
{
|
||||
os::Printer::log((c8*)errors->GetBufferPointer());
|
||||
os::Printer::log((c8*)errors->GetBufferPointer(), ELL_ERROR);
|
||||
errors->Release();
|
||||
if (buffer)
|
||||
buffer->Release();
|
||||
|
@ -237,7 +237,7 @@ bool CD3D9HLSLMaterialRenderer::createHLSLPixelShader(const char* pixelShaderPro
|
|||
if (FAILED(pID3DDevice->CreatePixelShader((DWORD*)buffer->GetBufferPointer(),
|
||||
&PixelShader)))
|
||||
{
|
||||
os::Printer::log("Could not create hlsl pixel shader.");
|
||||
os::Printer::log("Could not create hlsl pixel shader.", ELL_ERROR);
|
||||
buffer->Release();
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -121,14 +121,14 @@ void CD3D9ShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& material
|
|||
|
||||
// set new vertex shader
|
||||
if (FAILED(pID3DDevice->SetVertexShader(VertexShader)))
|
||||
os::Printer::log("Could not set vertex shader.");
|
||||
os::Printer::log("Could not set vertex shader.", ELL_WARNING);
|
||||
}
|
||||
|
||||
// set new pixel shader
|
||||
if (PixelShader)
|
||||
{
|
||||
if (FAILED(pID3DDevice->SetPixelShader(PixelShader)))
|
||||
os::Printer::log("Could not set pixel shader.");
|
||||
os::Printer::log("Could not set pixel shader.", ELL_WARNING);
|
||||
}
|
||||
|
||||
if (BaseMaterial)
|
||||
|
@ -201,8 +201,8 @@ bool CD3D9ShaderMaterialRenderer::createPixelShader(const c8* pxsh)
|
|||
if (errors)
|
||||
{
|
||||
// print out compilation errors.
|
||||
os::Printer::log("Pixel shader compilation failed:");
|
||||
os::Printer::log((c8*)errors->GetBufferPointer());
|
||||
os::Printer::log("Pixel shader compilation failed:", ELL_ERROR);
|
||||
os::Printer::log((c8*)errors->GetBufferPointer(), ELL_ERROR);
|
||||
|
||||
if (code)
|
||||
code->Release();
|
||||
|
@ -213,7 +213,7 @@ bool CD3D9ShaderMaterialRenderer::createPixelShader(const c8* pxsh)
|
|||
|
||||
if (FAILED(pID3DDevice->CreatePixelShader((DWORD*)code->GetBufferPointer(), &PixelShader)))
|
||||
{
|
||||
os::Printer::log("Could not create pixel shader.");
|
||||
os::Printer::log("Could not create pixel shader.", ELL_ERROR);
|
||||
code->Release();
|
||||
return false;
|
||||
}
|
||||
|
@ -260,8 +260,8 @@ bool CD3D9ShaderMaterialRenderer::createVertexShader(const char* vtxsh)
|
|||
if (errors)
|
||||
{
|
||||
// print out compilation errors.
|
||||
os::Printer::log("Vertex shader compilation failed:");
|
||||
os::Printer::log((c8*)errors->GetBufferPointer());
|
||||
os::Printer::log("Vertex shader compilation failed:", ELL_ERROR);
|
||||
os::Printer::log((c8*)errors->GetBufferPointer(), ELL_ERROR);
|
||||
|
||||
if (code)
|
||||
code->Release();
|
||||
|
@ -272,7 +272,7 @@ bool CD3D9ShaderMaterialRenderer::createVertexShader(const char* vtxsh)
|
|||
|
||||
if (!code || FAILED(pID3DDevice->CreateVertexShader((DWORD*)code->GetBufferPointer(), &VertexShader)))
|
||||
{
|
||||
os::Printer::log("Could not create vertex shader.");
|
||||
os::Printer::log("Could not create vertex shader.", ELL_ERROR);
|
||||
if (code)
|
||||
code->Release();
|
||||
return false;
|
||||
|
|
|
@ -194,7 +194,7 @@ bool COpenGLSLMaterialRenderer::createShader(GLenum shaderType, const char* shad
|
|||
|
||||
if (!status)
|
||||
{
|
||||
os::Printer::log("GLSL shader failed to compile");
|
||||
os::Printer::log("GLSL shader failed to compile", ELL_ERROR);
|
||||
// check error message and log it
|
||||
int maxLength=0;
|
||||
GLsizei length;
|
||||
|
@ -204,7 +204,7 @@ bool COpenGLSLMaterialRenderer::createShader(GLenum shaderType, const char* shad
|
|||
#endif
|
||||
GLcharARB *pInfoLog = new GLcharARB[maxLength];
|
||||
Driver->extGlGetInfoLog(shaderHandle, maxLength, &length, pInfoLog);
|
||||
os::Printer::log(reinterpret_cast<const c8*>(pInfoLog));
|
||||
os::Printer::log(reinterpret_cast<const c8*>(pInfoLog), ELL_ERROR);
|
||||
delete [] pInfoLog;
|
||||
|
||||
return false;
|
||||
|
@ -228,7 +228,7 @@ bool COpenGLSLMaterialRenderer::linkProgram()
|
|||
|
||||
if (!status)
|
||||
{
|
||||
os::Printer::log("GLSL shader program failed to link");
|
||||
os::Printer::log("GLSL shader program failed to link", ELL_ERROR);
|
||||
// check error message and log it
|
||||
int maxLength=0;
|
||||
GLsizei length;
|
||||
|
@ -238,7 +238,7 @@ bool COpenGLSLMaterialRenderer::linkProgram()
|
|||
#endif
|
||||
GLcharARB *pInfoLog = new GLcharARB[maxLength];
|
||||
Driver->extGlGetInfoLog(Program, maxLength, &length, pInfoLog);
|
||||
os::Printer::log(reinterpret_cast<const c8*>(pInfoLog));
|
||||
os::Printer::log(reinterpret_cast<const c8*>(pInfoLog), ELL_ERROR);
|
||||
delete [] pInfoLog;
|
||||
|
||||
return false;
|
||||
|
@ -264,7 +264,7 @@ bool COpenGLSLMaterialRenderer::linkProgram()
|
|||
|
||||
if (maxlen == 0)
|
||||
{
|
||||
os::Printer::log("GLSL: failed to retrieve uniform information");
|
||||
os::Printer::log("GLSL: failed to retrieve uniform information", ELL_ERROR);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -308,7 +308,7 @@ bool COpenGLSLMaterialRenderer::setVertexShaderConstant(const c8* name, const f3
|
|||
|
||||
void COpenGLSLMaterialRenderer::setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount)
|
||||
{
|
||||
os::Printer::log("Cannot set constant, please use high level shader call instead.");
|
||||
os::Printer::log("Cannot set constant, please use high level shader call instead.", ELL_WARNING);
|
||||
}
|
||||
|
||||
bool COpenGLSLMaterialRenderer::setPixelShaderConstant(const c8* name, const f32* floats, int count)
|
||||
|
@ -361,7 +361,7 @@ bool COpenGLSLMaterialRenderer::setPixelShaderConstant(const c8* name, const f32
|
|||
|
||||
void COpenGLSLMaterialRenderer::setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount)
|
||||
{
|
||||
os::Printer::log("Cannot set constant, use high level shader call.");
|
||||
os::Printer::log("Cannot set constant, use high level shader call.", ELL_WARNING);
|
||||
}
|
||||
|
||||
IVideoDriver* COpenGLSLMaterialRenderer::getVideoDriver()
|
||||
|
|
|
@ -193,7 +193,7 @@ bool COpenGLShaderMaterialRenderer::createPixelShader(const c8* pxsh)
|
|||
|
||||
char tmp[2048];
|
||||
sprintf(tmp, "Pixel shader compilation failed at position %d:\n%s", errPos, errString);
|
||||
os::Printer::log(tmp);
|
||||
os::Printer::log(tmp, ELL_ERROR);
|
||||
|
||||
Driver->extGlDeletePrograms(1, &PixelShader);
|
||||
PixelShader=0;
|
||||
|
@ -235,7 +235,7 @@ bool COpenGLShaderMaterialRenderer::createVertexShader(const c8* vtxsh)
|
|||
|
||||
char tmp[2048];
|
||||
sprintf(tmp, "Vertex shader compilation failed at position %d:\n%s", errPos, errString);
|
||||
os::Printer::log(tmp);
|
||||
os::Printer::log(tmp, ELL_ERROR);
|
||||
|
||||
Driver->extGlDeletePrograms(1, &VertexShader);
|
||||
VertexShader=0;
|
||||
|
|
Loading…
Reference in New Issue