~3v1n0/unity/fix-load-icon-crash-926658

« back to all changes in this revision

Viewing changes to unity-shared/IconRenderer.cpp

Committer: Marco Trevisan (Treviño)
Date: 2012-08-10 12:35:24 UTC
mfrom: (2509.1.36 unity)
Revision ID: mail@3v1n0.net-20120810123524-l41egcjcmt778uzc

Merging with trunk

files added:
plugins/unityshell/src/UnityGestureTarget.cpp

plugins/unityshell/src/UnityGestureTarget.h

plugins/unityshell/src/WindowGestureTarget.cpp

plugins/unityshell/src/WindowGestureTarget.h

tests/test-gestures/FakeGestureEvent.h

tests/test-gestures/NuxMock.h

tests/test-gestures/UnityGestureTargetMock.h

tests/test-gestures/WindowGestureTargetMock.h

tests/test-gestures/sed_script_gesture

tests/test-gestures/test_gestures_main.cpp

tests/test-gestures/test_window_gesture_target.cpp

tests/test-gestures/unityshell_mock.h

tests/test_panel_style.cpp

files removed:
launcher/GeisAdapter.cpp

launcher/GeisAdapter.h

tests/test-gesture-engine/GeisAdapterMock.cpp

tests/test-gesture-engine/GeisAdapterMock.h

files renamed:
plugins/unityshell/src/GestureEngine.cpp => plugins/unityshell/src/UnityGestureBroker.cpp

plugins/unityshell/src/GestureEngine.h => plugins/unityshell/src/UnityGestureBroker.h

tests/test-gesture-engine/ => tests/test-gestures/

tests/test-gesture-engine/sed_script => tests/test-gestures/sed_script_broker

tests/test-gesture-engine/test_gesture_engine.cpp => tests/test-gestures/test_gesture_broker.cpp

files modified:
AUTHORS

CMakeLists.txt

ChangeLog

HACKING

UnityCore/CMakeLists.txt

UnityCore/HomeLens.cpp

dash/ResultViewGrid.cpp

launcher/CMakeLists.txt

launcher/FavoriteStoreGSettings.cpp

launcher/FavoriteStoreGSettings.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherController.h

launcher/LauncherModel.cpp

launcher/StandaloneLauncher.cpp

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/TrashLauncherIcon.cpp

launcher/TrashLauncherIcon.h

manual-tests/Launcher.txt

panel/PanelIndicatorEntryView.cpp

panel/PanelMenuView.cpp

panel/PanelView.cpp

plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp

plugins/unitydialog/src/unitydialog.cpp

plugins/unityshell/CMakeLists.txt

plugins/unityshell/src/nux-layout-accessible.cpp

plugins/unityshell/src/unity-launcher-accessible.cpp

plugins/unityshell/src/unity-switcher-accessible.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

plugins/unityshell/unityshell.xml.in

po/POTFILES.in

services/panel-main.c

tests/CMakeLists.txt

tests/autopilot/unity/tests/launcher/test_icon_behavior.py

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_panel.py

tests/autopilot/unity/tests/test_quicklist.py

tests/autopilot/unity/tests/test_switcher.py

tests/test-gestures/CMakeLists.txt

tests/test-gestures/compiz_mock/core/screen.h

tests/test-gestures/compiz_mock/core/window.h

tests/test_favorite_store_gsettings.cpp

tests/test_launcher_controller.cpp

tests/test_main.cpp

tests/test_switcher_controller.cpp

unity-shared/BGHash.cpp

unity-shared/DashStyle.cpp

unity-shared/IconRenderer.cpp

unity-shared/PanelStyle.cpp

unity-shared/PanelStyle.h

unity-shared/PluginAdapterCompiz.cpp

unity-standalone/StandaloneUnity.cpp

Show diffs side-by-side

added added

removed removed

unity-shared/IconRenderer.cpp

250

251

std::list<RenderArg>::iterator it;

252

int i;

253

for (it = args.begin(), i = 0; it != args.end(); it++, i++)

253

for (it = args.begin(), i = 0; it != args.end(); ++it, i++)

254

{

255

256

IconTextureSource* launcher_icon = it->icon;

757

CHECKGL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0));

758

CHECKGL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0));

759

760

int TextureObjectLocation;

761

760

int VertexLocation;

762

761

int TextureCoord0Location;

763

762

int FragmentColor = 0;

768

767

{

769

768

local::shader_program_uv_persp_correction->Begin();

770

769

771

TextureObjectLocation = local::shader_program_uv_persp_correction->GetUniformLocationARB("TextureObject0");

770

int TextureObjectLocation = local::shader_program_uv_persp_correction->GetUniformLocationARB("TextureObject0");

772

771

VertexLocation = local::shader_program_uv_persp_correction->GetAttributeLocation("iVertex");

773

772

TextureCoord0Location = local::shader_program_uv_persp_correction->GetAttributeLocation("iTexCoord0");

774

773

FragmentColor = local::shader_program_uv_persp_correction->GetUniformLocationARB("color0");

Older »