← Back to branch summary

~hikiko/nux/arb-srgba-shader

~hikiko/nux/arb-srgba-shader

« back to all changes in this revision

Viewing changes to NuxGraphics/GLRenderStates.h

Committer: Travis Watkins
Date: 2011-08-03 10:34:36 UTC
mfrom: (409 nux-logger-fix)
mto: (454.5.1 nux-gles)
mto: This revision was merged to the branch mainline in revision 501.
Revision ID: travis.watkins@linaro.org-20110803103436-biz9c9930l2refsi

merge with lp:nux

files added:
NuxCore/AsyncFileWriter.cpp

NuxCore/AsyncFileWriter.h

NuxCore/PropertyOperators.h

NuxCore/RollingFileAppender.cpp

NuxCore/RollingFileAppender.h

NuxGraphics/MeshFileLoader-OBJ.cpp

NuxGraphics/MeshFileLoader-OBJ.h

tests/Helpers.cpp

tests/Helpers.h

tests/test_async_file_writer.cpp

tests/test_main.cpp

tests/test_rolling_file_appender.cpp

files removed:
NuxCore/SmartPtr

NuxCore/SmartPtr/GenericSmartPointer.h

files modified:
.bzrignore

Nux/AbstractButton.cpp

Nux/AbstractComboBox.cpp

Nux/ActionItem.cpp

Nux/AnimatedTextureArea.cpp

Nux/Area.cpp

Nux/Area.h

Nux/BaseWindow.cpp

Nux/BaseWindow.h

Nux/BezierCurveControl.cpp

Nux/BezierCurveControl2.cpp

Nux/BezierCurveControl2.h

Nux/Button.cpp

Nux/Canvas.cpp

Nux/CheckBox.cpp

Nux/CheckBox.h

Nux/ClientArea.cpp

Nux/ClientArea.h

Nux/ColorArea.cpp

Nux/ColorEditor.cpp

Nux/ColorEditor.h

Nux/ColorGradient.cpp

Nux/ColorPreview.cpp

Nux/ColorRangeValuator.cpp

Nux/ComboBoxComplex.cpp

Nux/ComboBoxSimple.cpp

Nux/ComboBoxSimple.h

Nux/CurveControl.cpp

Nux/EditTextBox.cpp

Nux/EditTextBox.h

Nux/FileSelector.cpp

Nux/FloatingWindow.cpp

Nux/FloatingWindow.h

Nux/Focusable.cpp

Nux/FolderTreeItem.h

Nux/FunctionGraph.cpp

Nux/GridHLayout.cpp

Nux/GridHLayout.h

Nux/GridVLayout.cpp

Nux/GridVLayout.h

Nux/GroupBox.cpp

Nux/GroupBox.h

Nux/GroupBox2.cpp

Nux/GroupBox2.h

Nux/HLayout.cpp

Nux/HLayout.h

Nux/HScrollBar.cpp

Nux/HScrollBar.h

Nux/HSplitter.cpp

Nux/HSplitter.h

Nux/HToolBar.cpp

Nux/Histogram.cpp

Nux/HueRangeValuator.cpp

Nux/InputArea.cpp

Nux/InputArea.h

Nux/KeyboardHandler.h

Nux/LayeredLayout.cpp

Nux/LayeredLayout.h

Nux/Layout.cpp

Nux/Layout.h

Nux/Matrix3Editor.cpp

Nux/Matrix3Preview.cpp

Nux/Matrix4Editor.cpp

Nux/Matrix4Editor.h

Nux/Matrix4Preview.cpp

Nux/MenuBar.cpp

Nux/MenuPage.cpp

Nux/MenuPage.h

Nux/MouseAreaCtrl.cpp

Nux/MouseHandler.cpp

Nux/MouseHandler.h

Nux/NumericValuator.cpp

Nux/Nux.h

Nux/Panel.cpp

Nux/Panel.h

Nux/PropertyItem/RGBAProperty.cpp

Nux/PropertyItem/RGBProperty.cpp

Nux/PushButton.cpp

Nux/RGBValuator.cpp

Nux/RGBValuator.h

Nux/RadioButton.cpp

Nux/RadioButton.h

Nux/RadioButtonGroup.cpp

Nux/RadioButtonGroup.h

Nux/RangeValue.cpp

Nux/RangeValueInteger.cpp

Nux/ScrollBar.cpp

Nux/ScrollBar.h

Nux/ScrollView.cpp

Nux/ScrollView.h

Nux/SpinBox.cpp

Nux/SpinBoxDouble.cpp

Nux/SpinBox_Logic.cpp

Nux/SplineCurveEditor.cpp

Nux/SplineCurveEditor.h

Nux/SplineCurvePreview.cpp

Nux/StaticTextBox.cpp

Nux/StaticTextBox.h

Nux/TabView.cpp

Nux/TabView.h

Nux/TableCtrl.cpp

Nux/TableCtrl.h

Nux/TextEntry.cpp

Nux/TextEntry.h

Nux/TextView/TextView.cpp

Nux/TextView/TextViewInternal.h

Nux/TextView/TextViewWidget.cpp

Nux/TextView/TextViewWidget.h

Nux/TextViewGCC/TextViewWidget.h

Nux/TextureArea.cpp

Nux/TimeGraph.cpp

Nux/Timeline.h

Nux/ToolButton.cpp

Nux/TreeControl.cpp

Nux/TreeControl.h

Nux/VLayout.cpp

Nux/VLayout.h

Nux/VScrollBar.cpp

Nux/VScrollBar.h

Nux/VSplitter.cpp

Nux/VSplitter.h

Nux/VToolBar.cpp

Nux/Valuator.cpp

Nux/ValuatorDouble.cpp

Nux/ValuatorInt.cpp

Nux/Vector3Valuator.cpp

Nux/Vector3ValuatorDouble.cpp

Nux/View.cpp

Nux/View.h

Nux/WindowCompositor.cpp

Nux/WindowCompositor.h

Nux/WindowThread.cpp

NuxCore/Character/NUnicode.cpp

NuxCore/Color.cpp

NuxCore/FileManager/NFileManagerStandardAnsi.cpp

NuxCore/Logger.cpp

NuxCore/Logger.h

NuxCore/LoggingWriter.cpp

NuxCore/Makefile.am

NuxCore/Math/Quaternion.cpp

NuxCore/Math/Quaternion.h

NuxCore/NumberConversion.cpp

NuxCore/NuxCore.h

NuxCore/Object.cpp *

NuxCore/Object.h

NuxCore/ObjectPtr.h

NuxCore/Property-inl.h

NuxCore/Property.h

NuxCore/PropertyTraits.h

NuxCore/Rect.cpp

NuxCore/System.h

NuxCore/SystemWindows.h

NuxCore/TinyXML/tinyxml.cpp

NuxCore/TinyXML/tinyxmlparser.cpp

NuxGraphics/Events.h

NuxGraphics/GLRenderStates.h

NuxGraphics/GLResource.cpp

NuxGraphics/GLResource.h

NuxGraphics/GLShaderParameter.cpp

NuxGraphics/GLShaderParameter.h

NuxGraphics/GLVertexResourceManager.cpp

NuxGraphics/GLVertexResourceManager.h

NuxGraphics/GpuDevice.h

NuxGraphics/GpuDeviceTexture.cpp

NuxGraphics/GpuDeviceVertex.cpp

NuxGraphics/GraphicsDisplayWin.cpp

NuxGraphics/GraphicsDisplayX11.cpp

NuxGraphics/GraphicsEngine.cpp

NuxGraphics/GraphicsEngine.h

NuxGraphics/IOpenGLAsmShader.cpp

NuxGraphics/IOpenGLFrameBufferObject.cpp

NuxGraphics/IOpenGLGLSLShader.cpp

NuxGraphics/IOpenGLGLSLShader.h

NuxGraphics/IOpenGLResource.h

NuxGraphics/IOpenGLTexture2D.cpp

NuxGraphics/IOpenGLTexture2D.h

NuxGraphics/IOpenGLVertexBuffer.h

NuxGraphics/IOpenGLVertexDeclaration.cpp

NuxGraphics/IOpenGLVertexDeclaration.h

NuxGraphics/Makefile.am

NuxGraphics/MeshData.cpp

NuxGraphics/MeshData.h

NuxGraphics/OpenGLMapping.h

NuxGraphics/RenderingPipe.cpp

NuxGraphics/RenderingPipeAsm.cpp

NuxGraphics/RenderingPipeGLSL.cpp

NuxGraphics/XInputWindow.cpp

NuxGraphics/XInputWindow.h

NuxGraphics/nux-graphics.pc.in

NuxImage/DDS.cpp

NuxImage/DDS.h

NuxImage/GdkGraphics.cpp

NuxImage/GdkGraphics.h

NuxImage/ImageSurface.cpp

NuxImage/Tga.cpp

configure.ac

data/UITextures/ButtonDisable.tga

data/UITextures/ButtonMouseDown.tga

data/UITextures/ButtonMouseNormal.tga

data/UITextures/ButtonMouseOver.tga

data/UITextures/ButtonNormal.tga

data/UITextures/ComboBoxButton.tga

data/UITextures/Corner_shadow.tga

data/UITextures/DropShadow_10pxrad.tga

data/UITextures/DropShadow_4pxrad.tga

data/UITextures/Folder-16x16.tga

data/UITextures/Folder-24x24.tga

data/UITextures/FunctionGraphBackground.tga

data/UITextures/GraphBarIcon.tga

data/UITextures/GraphIcon.tga

data/UITextures/HScrollBar.tga

data/UITextures/Matrix3Preview.tga

data/UITextures/Matrix4Preview.tga

data/UITextures/RoundCorner_10px_shadow.tga

data/UITextures/RoundCorner_10pxrad.tga

data/UITextures/RoundCorner_1pxrad.tga

data/UITextures/RoundCorner_2pxrad.tga

data/UITextures/RoundCorner_4px_shadow.tga

data/UITextures/RoundCorner_4pxrad.tga

data/UITextures/ScrollBarTriangleDown.tga

data/UITextures/ScrollBarTriangleLeft.tga

data/UITextures/ScrollBarTriangleRight.tga

data/UITextures/ScrollBarTriangleUp.tga

data/UITextures/SpinerDown.tga

data/UITextures/SpinerUp.tga

data/UITextures/Stroke_0pxrad_1px.tga

data/UITextures/Stroke_10pxrad_2px.tga

data/UITextures/Stroke_1pxrad_1px.tga

data/UITextures/Stroke_1pxrad_2px.tga

data/UITextures/Stroke_2pxrad_1px.tga

data/UITextures/Stroke_2pxrad_2px.tga

data/UITextures/Stroke_4pxrad_2px.tga

data/UITextures/TabLeft.tga

data/UITextures/TabRight.tga

data/UITextures/TreeNodeClose.tga

data/UITextures/TreeNodeOpen.tga

data/UITextures/TriangleDown.tga

data/UITextures/TriangleLeft.tga

data/UITextures/TriangleRight.tga

data/UITextures/TriangleUp.tga

data/UITextures/VScrollBar.tga

data/UITextures/ValuatorHorizontalMove.tga

data/UITextures/ValuatorMove.tga

data/UITextures/ValuatorVerticalMove.tga

data/UITextures/VectorWLabel.tga

data/UITextures/VectorXLabel.tga

data/UITextures/VectorYLabel.tga

data/UITextures/VectorZLabel.tga

data/UITextures/WindowSizeGrip.tga

data/UITextures/ellipsisbutton.tga

examples/Makefile.am

examples/canvas.cpp

examples/text_entry_focus.cpp

tests/Makefile.am

tests/test-nux.cpp

tests/test-system.cpp

tests/test_properties.cpp

tools/unity_support_test.c

Show diffs side-by-side

added added

removed removed

NuxGraphics/GLRenderStates.h

346

346

inline void HW__SetPolygonOffset (float Factor, float Units);

347

347

348

348

private:

349

RenderStateMap *m_RenderStateChangeList;

350

RenderStateMap *m_SamplerStateChangeList;

351

349

RenderStateMap m_RenderStateChanges[GFXRS_MAX_RENDERSTATES];

352

350

RenderStateMap m_SamplerStateChanges[4][GFXSS_MAX_SAMPLERSTATES];

353

354

351

};

355

352

356

353

Older »