← Back to branch summary

~unity-team/nux/nux.redirected-views

~unity-team/nux/nux.redirected-views

« back to all changes in this revision

Viewing changes to NuxGraphics/GraphicsEngine.cpp

Committer: Tarmac
Author(s): Michi Henning
Date: 2012-10-02 01:05:45 UTC
mfrom: (667.2.5 1056633)
Revision ID: tarmac-20121002010545-jphizk30nj3oe9ui

Added -Wextra to compiler flags and removed a large number of warnings about unused parameters. Code compiles clean now without warnings, except for one remaining warning (see bug #1052765).. Fixes: https://bugs.launchpad.net/bugs/1056633. Approved by Michi Henning.

files modified:
Nux/AbstractButton.cpp

Nux/AbstractCheckedButton.cpp

Nux/AbstractComboBox.cpp

Nux/ActionItem.cpp

Nux/AnimatedTextureArea.cpp

Nux/Area.cpp

Nux/Area.h

Nux/BaseWindow.cpp

Nux/BasicView.cpp

Nux/Button.cpp

Nux/Canvas.cpp

Nux/CheckBox.cpp

Nux/ClientArea.cpp

Nux/ColorEditor.cpp

Nux/ColorPickerDialog.cpp

Nux/ColorPreview.cpp

Nux/Coverflow.cpp

Nux/CoverflowItem.h

Nux/EditTextBox.cpp

Nux/FileSelector.cpp

Nux/FloatingWindow.cpp

Nux/GeisAdapter.cpp

Nux/GroupBox.cpp

Nux/GroupBox2.cpp

Nux/HLayout.cpp

Nux/HScrollBar.cpp

Nux/HScrollBar.h

Nux/HSplitter.cpp

Nux/InputArea.cpp

Nux/InputArea.h

Nux/InputMethodIBus.cpp

Nux/KeyboardHandler.cpp

Nux/LayeredLayout.cpp

Nux/Layout.cpp

Nux/Layout.h

Nux/LinearLayout.cpp

Nux/MainLoopGLib.cpp

Nux/MenuBar.cpp

Nux/MenuPage.cpp

Nux/MenuPage.h

Nux/MouseAreaCtrl.cpp

Nux/NumericValuator.cpp

Nux/Nux.cpp

Nux/Painter.cpp

Nux/Panel.cpp

Nux/ProgramFramework/ProgramTemplate.cpp

Nux/ProgramFramework/TestTextEntry.cpp

Nux/ProgramFramework/TestView.cpp

Nux/RGBValuator.cpp

Nux/RadioButton.cpp

Nux/RangeValue.cpp

Nux/RangeValueInteger.cpp

Nux/ScrollView.cpp

Nux/SpinBox.cpp

Nux/SpinBoxDouble.cpp

Nux/SpinBox_Logic.cpp

Nux/StaticText.cpp

Nux/StaticTextBox.cpp

Nux/SystemThread.cpp

Nux/TabView.cpp

Nux/TextEntry.cpp

Nux/TextLoader.cpp

Nux/TextureArea.cpp

Nux/Theme.cpp

Nux/Timeline.cpp

Nux/ToolButton.cpp

Nux/VLayout.cpp

Nux/VScrollBar.cpp

Nux/VScrollBar.h

Nux/VSplitter.cpp

Nux/Validator.h

Nux/View.cpp

Nux/View.h

Nux/WindowCompositor.cpp

Nux/WindowThread.cpp

NuxCore/FileManager/NFileManagerGNU.cpp

NuxCore/FileManager/NFileManagerGNU.h

NuxCore/FileManager/NFileManagerGeneric.cpp

NuxCore/FileManager/NFileManagerGeneric.h

NuxCore/FileManager/NSerializer.h

NuxCore/Memory.cpp

NuxCore/NuxCore.cpp

NuxCore/NuxCore.h

NuxCore/Object.cpp

NuxCore/ObjectPtr.h

NuxCore/OutputDevice.cpp

NuxCore/OutputDevice.h

NuxCore/Parsing.cpp

NuxCore/Platform.cpp

NuxCore/Property-inl.h

NuxCore/TextString.h

NuxCore/ThreadGNU.cpp

NuxCore/ThreadGNU.h

NuxGraphics/CairoGraphics.cpp

NuxGraphics/FontTexture.cpp

NuxGraphics/GLError.cpp

NuxGraphics/GLPBuffer.cpp

NuxGraphics/GLResource.cpp

NuxGraphics/GLResourceManager.h

NuxGraphics/GLSh_ColorPicker.cpp

NuxGraphics/GLSh_DrawFunction.cpp

NuxGraphics/GLSh_Fill.cpp

NuxGraphics/GLShaderParameter.h

NuxGraphics/GLTemplatePrimitiveBuffer.cpp

NuxGraphics/GLTextureResourceManager.cpp

NuxGraphics/GpuDevice.cpp

NuxGraphics/GpuDeviceTexture.cpp

NuxGraphics/GpuDeviceVertex.cpp

NuxGraphics/GraphicsDisplayX11.cpp

NuxGraphics/GraphicsEngine.cpp

NuxGraphics/IOpenGLAnimatedTexture.h

NuxGraphics/IOpenGLBaseTexture.cpp

NuxGraphics/IOpenGLCubeTexture.cpp

NuxGraphics/IOpenGLQuery.cpp

NuxGraphics/IOpenGLRectangleTexture.cpp

NuxGraphics/IOpenGLTexture2D.cpp

NuxGraphics/IOpenGLVertexDeclaration.cpp

NuxGraphics/ImageSurface.cpp

NuxGraphics/ImageSurface.h

NuxGraphics/RenderingPipeAsm.cpp

NuxGraphics/RenderingPipeGLSL.cpp

configure.ac

examples/coverflow.cpp

examples/gestures.cpp

examples/line-separator.cpp

examples/line-separator.h

examples/shortcut-keys.cpp

examples/text_entry_focus.cpp

gputests/arb_programs_limits.cpp

gputests/framebufferobject.cpp

gputests/quad_2texmod.cpp

gputests/texture_blur.cpp

gputests/texture_copy_blur.cpp

gputests/texture_data.cpp

gputests/texture_power_of_2.cpp

tests/geis_mock.cpp

tests/gtest-nux-area.cpp

tests/gtest-nux-cairo-wrapper.cpp

tests/gtest-nux-gesturebroker.cpp

tests/gtest-nux-windowcompositor.cpp

tests/gtest-nuxcore-object.cpp

tests/nux_automated_test_framework.cpp

tests/test-scrollview.cpp

tests/test_empty_window.cpp

tests/test_graphics_display.cpp

tests/xtest-button.cpp

tests/xtest-focus-on-mouse-down.cpp

tests/xtest-focus-on-mouse-enter.cpp

tests/xtest-hgrid-key-navigation.cpp

tests/xtest-hlayout-key-navigation.cpp

tests/xtest-keynav-directions.cpp

tests/xtest-mouse-buttons.cpp

tests/xtest-mouse-events.cpp

tests/xtest-scrollbar.cpp

tests/xtest-text-entry-compositionkeys.cpp

tests/xtest-text-entry-deadkeys.cpp

tests/xtest-text-entry-logic.cpp

tests/xtest-text-entry.cpp

tests/xtest-vlayout-key-navigation.cpp

Show diffs side-by-side

added added

removed removed

NuxGraphics/GraphicsEngine.cpp

121

121

}

122

122

}

123

123

124

void BlendOperator::SetCustomBlendOperator(unsigned int src_blend, unsigned int dst_blend)

124

void BlendOperator::SetCustomBlendOperator(unsigned int /* src_blend */, unsigned int /* dst_blend */)

125

125

{

126

126

127

127

}

1135

1135

viewport_height = _viewport.height;

1136

1136

}

1137

1137

1138

void GraphicsEngine::SetScissorOffset(int x, int y)

1138

void GraphicsEngine::SetScissorOffset(int /* x */, int /* y */)

1139

1139

{

1140

1140

nuxAssertMsg(0, "[GraphicsEngine::SetScissorOffset] SetScissorOffset is deprecated.");

1141

1141

// m_ScissorXOffset = x;

1202

1202

// 2D Area Clear Color Depth Stencil //

1203

1203

/////////////////////////////////////////

1204

1204

1205

void GraphicsEngine::ClearAreaColorDepthStencil(int x, int y, int width, int height, Color clear_color, float cleardepth, int clearstencil)

1205

void GraphicsEngine::ClearAreaColorDepthStencil(int x, int y, int width, int height, Color clear_color, float /* cleardepth */, int clearstencil)

1206

1206

{

1207

1207

// enable stencil buffer

1208

1208

CHECKGL(glEnable(GL_STENCIL_TEST));

1226

1226

QRP_Color(x, y, width, height, clear_color);

1227

1227

}

1228

1228

1229

void GraphicsEngine::ClearAreaDepthStencil(int x, int y, int width, int height, float cleardepth, int clearstencil)

1229

void GraphicsEngine::ClearAreaDepthStencil(int x, int y, int width, int height, float /* cleardepth */, int clearstencil)

1230

1230

{

1231

1231

// enable stencil buffer

1232

1232

CHECKGL(glEnable(GL_STENCIL_TEST));

Older »